summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/BeaconEntity.h10
-rw-r--r--src/BlockEntities/BlockEntityWithItems.h4
-rw-r--r--src/BlockEntities/ChestEntity.cpp2
-rw-r--r--src/BlockEntities/ChestEntity.h8
-rw-r--r--src/BlockEntities/CommandBlockEntity.h8
-rw-r--r--src/BlockEntities/DispenserEntity.h4
-rw-r--r--src/BlockEntities/DropSpenserEntity.cpp2
-rw-r--r--src/BlockEntities/DropSpenserEntity.h14
-rw-r--r--src/BlockEntities/DropperEntity.h4
-rw-r--r--src/BlockEntities/EnderChestEntity.h8
-rw-r--r--src/BlockEntities/FlowerPotEntity.h8
-rw-r--r--src/BlockEntities/FurnaceEntity.h14
-rw-r--r--src/BlockEntities/HopperEntity.cpp2
-rw-r--r--src/BlockEntities/HopperEntity.h10
-rw-r--r--src/BlockEntities/JukeboxEntity.h6
-rw-r--r--src/BlockEntities/MobHeadEntity.h6
-rw-r--r--src/BlockEntities/NoteEntity.h6
-rw-r--r--src/BlockEntities/SignEntity.h6
18 files changed, 61 insertions, 61 deletions
diff --git a/src/BlockEntities/BeaconEntity.h b/src/BlockEntities/BeaconEntity.h
index ebd6cf9be..0d7150aef 100644
--- a/src/BlockEntities/BeaconEntity.h
+++ b/src/BlockEntities/BeaconEntity.h
@@ -35,11 +35,11 @@ public:
cBeaconEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
bool LoadFromJson(const Json::Value & a_Value);
- // cBlockEntity /*override*/s:
- virtual void SaveToJson(Json::Value& a_Value) /*override*/;
- virtual void SendTo(cClientHandle & a_Client) /*override*/;
- virtual bool Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
+ // cBlockEntity overrides:
+ virtual void SaveToJson(Json::Value& a_Value) override;
+ virtual void SendTo(cClientHandle & a_Client) override;
+ virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+ virtual void UsedBy(cPlayer * a_Player) override;
/** Modify the beacon level. (It is needed to load the beacon corectly) */
void SetBeaconLevel(char a_Level) { m_BeaconLevel = a_Level; }
diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h
index d70535e08..5f1639d45 100644
--- a/src/BlockEntities/BlockEntityWithItems.h
+++ b/src/BlockEntities/BlockEntityWithItems.h
@@ -43,7 +43,7 @@ public:
m_Contents.AddListener(*this);
}
- virtual void Destroy(void) /*override*/
+ virtual void Destroy(void) override
{
// Drop the contents as pickups:
ASSERT(m_World != NULL);
@@ -72,7 +72,7 @@ public:
protected:
cItemGrid m_Contents;
- // cItemGrid::cListener /*override*/s:
+ // cItemGrid::cListener overrides:
virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum)
{
UNUSED(a_SlotNum);
diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp
index 602aed609..21e1f6ba2 100644
--- a/src/BlockEntities/ChestEntity.cpp
+++ b/src/BlockEntities/ChestEntity.cpp
@@ -141,7 +141,7 @@ void cChestEntity::OpenNewWindow(void)
{
}
- virtual bool Item(cChestEntity * a_Chest) /*override*/
+ virtual bool Item(cChestEntity * a_Chest) override
{
if ((a_Chest->GetPosY() + 1 < cChunkDef::Height) && cBlockInfo::IsSolid(a_Chest->GetWorld()->GetBlock(a_Chest->GetPosX(), a_Chest->GetPosY() + 1, a_Chest->GetPosZ())))
{
diff --git a/src/BlockEntities/ChestEntity.h b/src/BlockEntities/ChestEntity.h
index 4bb7cdf33..cd06b3e2c 100644
--- a/src/BlockEntities/ChestEntity.h
+++ b/src/BlockEntities/ChestEntity.h
@@ -44,10 +44,10 @@ public:
bool LoadFromJson(const Json::Value & a_Value);
- // cBlockEntity /*override*/s:
- virtual void SaveToJson(Json::Value & a_Value) /*override*/;
- virtual void SendTo(cClientHandle & a_Client) /*override*/;
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
+ // cBlockEntity overrides:
+ virtual void SaveToJson(Json::Value & a_Value) override;
+ virtual void SendTo(cClientHandle & a_Client) override;
+ virtual void UsedBy(cPlayer * a_Player) override;
/** Opens a new chest window for this chest.
Scans for neighbors to open a double chest window, if appropriate. */
diff --git a/src/BlockEntities/CommandBlockEntity.h b/src/BlockEntities/CommandBlockEntity.h
index 7c6f195b5..d02bf7d7b 100644
--- a/src/BlockEntities/CommandBlockEntity.h
+++ b/src/BlockEntities/CommandBlockEntity.h
@@ -39,11 +39,11 @@ public:
cCommandBlockEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
bool LoadFromJson( const Json::Value& a_Value);
- virtual void SaveToJson(Json::Value& a_Value) /*override*/;
+ virtual void SaveToJson(Json::Value& a_Value) override;
- virtual bool Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
- virtual void SendTo(cClientHandle & a_Client) /*override*/;
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
+ virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+ virtual void SendTo(cClientHandle & a_Client) override;
+ virtual void UsedBy(cPlayer * a_Player) override;
void SetLastOutput(const AString & a_LastOut);
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index ec21791dc..b33d08342 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -33,8 +33,8 @@ public:
// tolua_end
private:
- // cDropSpenser /*override*/s:
- virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) /*override*/;
+ // cDropSpenser overrides:
+ virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) override;
/** If such a bucket can fit, adds it to m_Contents and returns true */
bool ScoopUpLiquid(int a_SlotNum, short a_BucketItemType);
diff --git a/src/BlockEntities/DropSpenserEntity.cpp b/src/BlockEntities/DropSpenserEntity.cpp
index 3fe8ae390..dc38e3e9b 100644
--- a/src/BlockEntities/DropSpenserEntity.cpp
+++ b/src/BlockEntities/DropSpenserEntity.cpp
@@ -2,7 +2,7 @@
// DropSpenserEntity.cpp
// Declares the cDropSpenserEntity class representing a common ancestor to the cDispenserEntity and cDropperEntity
-// The dropper and dispenser only needs to /*override*/ the DropSpenseFromSlot() function to provide the specific item behavior
+// The dropper and dispenser only needs to override the DropSpenseFromSlot() function to provide the specific item behavior
#include "Globals.h"
#include "DropSpenserEntity.h"
diff --git a/src/BlockEntities/DropSpenserEntity.h b/src/BlockEntities/DropSpenserEntity.h
index 497e52d14..be56447aa 100644
--- a/src/BlockEntities/DropSpenserEntity.h
+++ b/src/BlockEntities/DropSpenserEntity.h
@@ -2,7 +2,7 @@
// DropSpenser.h
// Declares the cDropSpenser class representing a common ancestor to the cDispenserEntity and cDropperEntity
-// The dropper and dispenser only needs to /*override*/ the DropSpenseFromSlot() function to provide the specific item behavior
+// The dropper and dispenser only needs to override the DropSpenseFromSlot() function to provide the specific item behavior
@@ -53,11 +53,11 @@ public:
bool LoadFromJson(const Json::Value & a_Value);
- // cBlockEntity /*override*/s:
- virtual void SaveToJson(Json::Value & a_Value) /*override*/;
- virtual bool Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
- virtual void SendTo(cClientHandle & a_Client) /*override*/;
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
+ // cBlockEntity overrides:
+ virtual void SaveToJson(Json::Value & a_Value) override;
+ virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+ virtual void SendTo(cClientHandle & a_Client) override;
+ virtual void UsedBy(cPlayer * a_Player) override;
// tolua_begin
@@ -70,7 +70,7 @@ public:
// tolua_end
/// Sets the internal redstone power flag to "on" or "off", depending on the parameter. Calls Activate() if appropriate
- virtual void SetRedstonePower(bool a_IsPowered) /*override*/;
+ virtual void SetRedstonePower(bool a_IsPowered) override;
protected:
bool m_ShouldDropSpense; ///< If true, the dropspenser will dropspense an item in the next tick
diff --git a/src/BlockEntities/DropperEntity.h b/src/BlockEntities/DropperEntity.h
index c87b42cf4..8e07bc6f8 100644
--- a/src/BlockEntities/DropperEntity.h
+++ b/src/BlockEntities/DropperEntity.h
@@ -31,8 +31,8 @@ public:
static const char * GetClassStatic(void) { return "cDropperEntity"; }
protected:
- // cDropSpenserEntity /*override*/s:
- virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) /*override*/;
+ // cDropSpenserEntity overrides:
+ virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) override;
/** Takes an item from slot a_SlotNum and puts it into the container in front of the dropper.
Called when there's a container directly in front of the dropper,
diff --git a/src/BlockEntities/EnderChestEntity.h b/src/BlockEntities/EnderChestEntity.h
index d3d494b20..ed178f6fc 100644
--- a/src/BlockEntities/EnderChestEntity.h
+++ b/src/BlockEntities/EnderChestEntity.h
@@ -24,10 +24,10 @@ public:
static const char * GetClassStatic(void) { return "cEnderChestEntity"; }
- // cBlockEntity /*override*/s:
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
- virtual void SaveToJson(Json::Value & a_Value) /*override*/ { UNUSED(a_Value); }
- virtual void SendTo(cClientHandle & a_Client) /*override*/ { UNUSED(a_Client); }
+ // cBlockEntity overrides:
+ virtual void UsedBy(cPlayer * a_Player) override;
+ virtual void SaveToJson(Json::Value & a_Value) override { UNUSED(a_Value); }
+ virtual void SendTo(cClientHandle & a_Client) override { UNUSED(a_Client); }
static void LoadFromJson(const Json::Value & a_Value, cItemGrid & a_Grid);
static void SaveToJson(Json::Value & a_Value, const cItemGrid & a_Grid);
diff --git a/src/BlockEntities/FlowerPotEntity.h b/src/BlockEntities/FlowerPotEntity.h
index 478c54270..89901cf2d 100644
--- a/src/BlockEntities/FlowerPotEntity.h
+++ b/src/BlockEntities/FlowerPotEntity.h
@@ -40,9 +40,9 @@ public:
cFlowerPotEntity(int a_BlocX, int a_BlockY, int a_BlockZ, cWorld * a_World);
bool LoadFromJson( const Json::Value& a_Value);
- virtual void SaveToJson(Json::Value& a_Value) /*override*/;
+ virtual void SaveToJson(Json::Value& a_Value) override;
- virtual void Destroy(void) /*override*/;
+ virtual void Destroy(void) override;
// tolua_begin
@@ -57,8 +57,8 @@ public:
// tolua_end
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
- virtual void SendTo(cClientHandle & a_Client) /*override*/;
+ virtual void UsedBy(cPlayer * a_Player) override;
+ virtual void SendTo(cClientHandle & a_Client) override;
static bool IsFlower(short m_ItemType, short m_ItemData);
diff --git a/src/BlockEntities/FurnaceEntity.h b/src/BlockEntities/FurnaceEntity.h
index 474c0c973..cf1a755e0 100644
--- a/src/BlockEntities/FurnaceEntity.h
+++ b/src/BlockEntities/FurnaceEntity.h
@@ -48,11 +48,11 @@ public:
bool LoadFromJson(const Json::Value & a_Value);
- // cBlockEntity /*override*/s:
- virtual void SaveToJson(Json::Value & a_Value) /*override*/;
- virtual void SendTo(cClientHandle & a_Client) /*override*/;
- virtual bool Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
+ // cBlockEntity overrides:
+ virtual void SaveToJson(Json::Value & a_Value) override;
+ virtual void SendTo(cClientHandle & a_Client) override;
+ virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+ virtual void UsedBy(cPlayer * a_Player) override;
/// Restarts cooking. Used after the furnace is loaded from storage to set up the internal variables so that cooking continues, if it was active. Returns true if cooking.
bool ContinueCooking(void);
@@ -152,8 +152,8 @@ protected:
/// Sets the m_IsCooking variable, updates the furnace block type based on the value
void SetIsCooking(bool a_IsCooking);
- // cItemGrid::cListener /*override*/s:
- virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) /*override*/;
+ // cItemGrid::cListener overrides:
+ virtual void OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum) override;
} ; // tolua_export
diff --git a/src/BlockEntities/HopperEntity.cpp b/src/BlockEntities/HopperEntity.cpp
index 59695d5b0..88e7b8e1b 100644
--- a/src/BlockEntities/HopperEntity.cpp
+++ b/src/BlockEntities/HopperEntity.cpp
@@ -209,7 +209,7 @@ bool cHopperEntity::MovePickupsIn(cChunk & a_Chunk, Int64 a_CurrentTick)
{
}
- virtual bool Item(cEntity * a_Entity) /*override*/
+ virtual bool Item(cEntity * a_Entity) override
{
ASSERT(a_Entity != NULL);
diff --git a/src/BlockEntities/HopperEntity.h b/src/BlockEntities/HopperEntity.h
index 5474eb623..8e856fcda 100644
--- a/src/BlockEntities/HopperEntity.h
+++ b/src/BlockEntities/HopperEntity.h
@@ -47,11 +47,11 @@ protected:
Int64 m_LastMoveItemsInTick;
Int64 m_LastMoveItemsOutTick;
- // cBlockEntity /*override*/s:
- virtual bool Tick(float a_Dt, cChunk & a_Chunk) /*override*/;
- virtual void SaveToJson(Json::Value & a_Value) /*override*/;
- virtual void SendTo(cClientHandle & a_Client) /*override*/;
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
+ // cBlockEntity overrides:
+ virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+ virtual void SaveToJson(Json::Value & a_Value) override;
+ virtual void SendTo(cClientHandle & a_Client) override;
+ virtual void UsedBy(cPlayer * a_Player) override;
/// Opens a new chest window for this chest. Scans for neighbors to open a double chest window, if appropriate.
void OpenNewWindow(void);
diff --git a/src/BlockEntities/JukeboxEntity.h b/src/BlockEntities/JukeboxEntity.h
index 725585eb3..d677d340f 100644
--- a/src/BlockEntities/JukeboxEntity.h
+++ b/src/BlockEntities/JukeboxEntity.h
@@ -31,7 +31,7 @@ public:
virtual ~cJukeboxEntity();
bool LoadFromJson(const Json::Value & a_Value);
- virtual void SaveToJson(Json::Value & a_Value) /*override*/;
+ virtual void SaveToJson(Json::Value & a_Value) override;
// tolua_begin
@@ -57,8 +57,8 @@ public:
static const char * GetClassStatic(void) { return "cJukeboxEntity"; }
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
- virtual void SendTo(cClientHandle &) /*override*/ {}
+ virtual void UsedBy(cPlayer * a_Player) override;
+ virtual void SendTo(cClientHandle &) override {}
private:
int m_Record;
diff --git a/src/BlockEntities/MobHeadEntity.h b/src/BlockEntities/MobHeadEntity.h
index 6fa156d52..f91a3cc9e 100644
--- a/src/BlockEntities/MobHeadEntity.h
+++ b/src/BlockEntities/MobHeadEntity.h
@@ -38,7 +38,7 @@ public:
cMobHeadEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
bool LoadFromJson( const Json::Value& a_Value);
- virtual void SaveToJson(Json::Value& a_Value) /*override*/;
+ virtual void SaveToJson(Json::Value& a_Value) override;
// tolua_begin
@@ -62,8 +62,8 @@ public:
// tolua_end
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
- virtual void SendTo(cClientHandle & a_Client) /*override*/;
+ virtual void UsedBy(cPlayer * a_Player) override;
+ virtual void SendTo(cClientHandle & a_Client) override;
static const char * GetClassStatic(void) { return "cMobHeadEntity"; }
diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h
index d7b28754c..f538de060 100644
--- a/src/BlockEntities/NoteEntity.h
+++ b/src/BlockEntities/NoteEntity.h
@@ -45,7 +45,7 @@ public:
virtual ~cNoteEntity() {}
bool LoadFromJson(const Json::Value & a_Value);
- virtual void SaveToJson(Json::Value & a_Value) /*override*/;
+ virtual void SaveToJson(Json::Value & a_Value) override;
// tolua_begin
@@ -56,8 +56,8 @@ public:
// tolua_end
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
- virtual void SendTo(cClientHandle &) /*override*/ {}
+ virtual void UsedBy(cPlayer * a_Player) override;
+ virtual void SendTo(cClientHandle &) override {}
virtual void SetRedstonePower(bool a_Value)
{
diff --git a/src/BlockEntities/SignEntity.h b/src/BlockEntities/SignEntity.h
index a8e388c47..33af100a4 100644
--- a/src/BlockEntities/SignEntity.h
+++ b/src/BlockEntities/SignEntity.h
@@ -38,7 +38,7 @@ public:
cSignEntity(BLOCKTYPE a_BlockType, int a_X, int a_Y, int a_Z, cWorld * a_World);
bool LoadFromJson( const Json::Value& a_Value);
- virtual void SaveToJson(Json::Value& a_Value) /*override*/;
+ virtual void SaveToJson(Json::Value& a_Value) override;
// tolua_begin
@@ -53,8 +53,8 @@ public:
// tolua_end
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
- virtual void SendTo(cClientHandle & a_Client) /*override*/;
+ virtual void UsedBy(cPlayer * a_Player) override;
+ virtual void SendTo(cClientHandle & a_Client) override;
static const char * GetClassStatic(void) { return "cSignEntity"; }
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 14:21:15 +0200