diff options
Diffstat (limited to 'src/Entities')
33 files changed, 133 insertions, 133 deletions
diff --git a/src/Entities/ArrowEntity.h b/src/Entities/ArrowEntity.h index 4bfcb1f6d..e35feef2a 100644 --- a/src/Entities/ArrowEntity.h +++ b/src/Entities/ArrowEntity.h @@ -93,10 +93,10 @@ protected: /// Stores the block position that arrow is lodged into, sets m_IsInGround to false if it becomes air Vector3i m_HitBlockPos; - // cProjectileEntity overrides: - virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; - virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override; - virtual void CollectedBy(cPlayer * a_Player) override; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; + // cProjectileEntity /*override*/s: + virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/; + virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/; + virtual void CollectedBy(cPlayer * a_Player) /*override*/; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; }; // tolua_export diff --git a/src/Entities/Boat.h b/src/Entities/Boat.h index 8de88d165..835adc889 100644 --- a/src/Entities/Boat.h +++ b/src/Entities/Boat.h @@ -23,12 +23,12 @@ class cBoat : public: CLASS_PROTODEF(cBoat) - // cEntity overrides: - virtual void SpawnOn(cClientHandle & a_ClientHandle) override; - virtual void OnRightClicked(cPlayer & a_Player) override; - virtual bool DoTakeDamage(TakeDamageInfo & TDI) override; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; - virtual void HandleSpeedFromAttachee(float a_Forward, float a_Sideways) override; + // cEntity /*override*/s: + virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/; + virtual void OnRightClicked(cPlayer & a_Player) /*override*/; + virtual bool DoTakeDamage(TakeDamageInfo & TDI) /*override*/; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; + virtual void HandleSpeedFromAttachee(float a_Forward, float a_Sideways) /*override*/; cBoat(double a_X, double a_Y, double a_Z); } ; diff --git a/src/Entities/EnderCrystal.h b/src/Entities/EnderCrystal.h index c98c3b681..f6024af86 100644 --- a/src/Entities/EnderCrystal.h +++ b/src/Entities/EnderCrystal.h @@ -21,10 +21,10 @@ public: private: - // cEntity overrides: - virtual void SpawnOn(cClientHandle & a_ClientHandle) override; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; - virtual void KilledBy(TakeDamageInfo & a_TDI) override; + // cEntity /*override*/s: + virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; + virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/; }; // tolua_export diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index b9c280b6b..3f3d369da 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -10,11 +10,11 @@ // Place this macro in the public section of each cEntity descendant class and you're done :) #define CLASS_PROTODEF(classname) \ - virtual bool IsA(const char * a_ClassName) const override\ + virtual bool IsA(const char * a_ClassName) const /*override*/\ { \ return ((strcmp(a_ClassName, #classname) == 0) || super::IsA(a_ClassName)); \ } \ - virtual const char * GetClass(void) const override \ + virtual const char * GetClass(void) const /*override*/ \ { \ return #classname; \ } \ @@ -22,7 +22,7 @@ { \ return #classname; \ } \ - virtual const char * GetParentClass(void) const override \ + virtual const char * GetParentClass(void) const /*override*/ \ { \ return super::GetClass(); \ } @@ -371,7 +371,7 @@ public: // tolua_end - /** Descendants override this function to send a command to the specified client to spawn the entity on the client. + /** Descendants /*override*/ this function to send a command to the specified client to spawn the entity on the client. To spawn on all eligible clients, use cChunkMap::BroadcastSpawnEntity() */ virtual void SpawnOn(cClientHandle & a_Client) = 0; @@ -420,7 +420,7 @@ public: // tolua_begin - // COMMON metadata flags; descendants may override the defaults: + // COMMON metadata flags; descendants may /*override*/ the defaults: virtual bool IsOnFire (void) const {return (m_TicksLeftBurning > 0); } virtual bool IsCrouched (void) const {return false; } virtual bool IsRiding (void) const {return false; } @@ -530,7 +530,7 @@ protected: int m_TicksSinceLastVoidDamage; /** Does the actual speed-setting. The default implementation just sets the member variable value; - overrides can provide further processing, such as forcing players to move at the given speed. */ + /*override*/s can provide further processing, such as forcing players to move at the given speed. */ virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ); virtual void Destroyed(void) {} // Called after the entity has been destroyed diff --git a/src/Entities/EntityEffect.h b/src/Entities/EntityEffect.h index 47c298f57..2667d1602 100644 --- a/src/Entities/EntityEffect.h +++ b/src/Entities/EntityEffect.h @@ -101,7 +101,7 @@ public: void SetDistanceModifier(double a_DistanceModifier) { m_DistanceModifier = a_DistanceModifier; } /** Called on each tick. - By default increases the m_Ticks, descendants may override to provide additional processing. */ + By default increases the m_Ticks, descendants may /*override*/ to provide additional processing. */ virtual void OnTick(cPawn & a_Target); /** Called when the effect is first added to an entity */ @@ -213,7 +213,7 @@ public: { } - virtual void OnActivate(cPawn & a_Target) override; + virtual void OnActivate(cPawn & a_Target) /*override*/; }; @@ -230,7 +230,7 @@ public: { } - virtual void OnActivate(cPawn & a_Target) override; + virtual void OnActivate(cPawn & a_Target) /*override*/; }; @@ -277,7 +277,7 @@ public: { } - virtual void OnTick(cPawn & a_Target) override; + virtual void OnTick(cPawn & a_Target) /*override*/; }; @@ -384,8 +384,8 @@ public: { } - // cEntityEffect overrides: - virtual void OnTick(cPawn & a_Target) override; + // cEntityEffect /*override*/s: + virtual void OnTick(cPawn & a_Target) /*override*/; }; @@ -402,8 +402,8 @@ public: { } - // cEntityEffect overrides: - virtual void OnTick(cPawn & a_Target) override; + // cEntityEffect /*override*/s: + virtual void OnTick(cPawn & a_Target) /*override*/; }; @@ -420,8 +420,8 @@ public: { } - // cEntityEffect overrides: - virtual void OnTick(cPawn & a_Target) override; + // cEntityEffect /*override*/s: + virtual void OnTick(cPawn & a_Target) /*override*/; }; @@ -438,8 +438,8 @@ public: { } - // cEntityEffect overrides: - virtual void OnTick(cPawn & a_Target) override; + // cEntityEffect /*override*/s: + virtual void OnTick(cPawn & a_Target) /*override*/; }; @@ -486,7 +486,7 @@ public: { } - virtual void OnTick(cPawn & a_Target) override; + virtual void OnTick(cPawn & a_Target) /*override*/; }; diff --git a/src/Entities/ExpBottleEntity.h b/src/Entities/ExpBottleEntity.h index d62a84469..95f10becd 100644 --- a/src/Entities/ExpBottleEntity.h +++ b/src/Entities/ExpBottleEntity.h @@ -27,7 +27,7 @@ public: protected: - // cProjectileEntity overrides: - virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; + // cProjectileEntity /*override*/s: + virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/; }; // tolua_export diff --git a/src/Entities/ExpOrb.h b/src/Entities/ExpOrb.h index bdb9a5b19..eb18d95c5 100644 --- a/src/Entities/ExpOrb.h +++ b/src/Entities/ExpOrb.h @@ -22,8 +22,8 @@ public: cExpOrb(const Vector3d & a_Pos, int a_Reward); // Override functions - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; - virtual void SpawnOn(cClientHandle & a_Client) override; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; + virtual void SpawnOn(cClientHandle & a_Client) /*override*/; /** Returns the number of ticks that this entity has existed */ int GetAge(void) const { return (int)(m_Timer / 50); } // tolua_export diff --git a/src/Entities/FallingBlock.h b/src/Entities/FallingBlock.h index c20fe8eb9..58190e9e9 100644 --- a/src/Entities/FallingBlock.h +++ b/src/Entities/FallingBlock.h @@ -28,9 +28,9 @@ public: BLOCKTYPE GetBlockType(void) const { return m_BlockType; } NIBBLETYPE GetBlockMeta(void) const { return m_BlockMeta; } - // cEntity overrides: - virtual void SpawnOn(cClientHandle & a_ClientHandle) override; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; + // cEntity /*override*/s: + virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; private: BLOCKTYPE m_BlockType; diff --git a/src/Entities/FireChargeEntity.h b/src/Entities/FireChargeEntity.h index 5df55bec4..3dafe12c1 100644 --- a/src/Entities/FireChargeEntity.h +++ b/src/Entities/FireChargeEntity.h @@ -29,8 +29,8 @@ protected: void Explode(int a_BlockX, int a_BlockY, int a_BlockZ); - // cProjectileEntity overrides: - virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; - virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override; + // cProjectileEntity /*override*/s: + virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/; + virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/; } ; // tolua_export diff --git a/src/Entities/FireworkEntity.h b/src/Entities/FireworkEntity.h index 20f18b6dc..70915f4d0 100644 --- a/src/Entities/FireworkEntity.h +++ b/src/Entities/FireworkEntity.h @@ -28,9 +28,9 @@ public: protected: - // cProjectileEntity overrides: - virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; + // cProjectileEntity /*override*/s: + virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) /*override*/; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; private: diff --git a/src/Entities/Floater.cpp b/src/Entities/Floater.cpp index 159429147..1a107d2f4 100644 --- a/src/Entities/Floater.cpp +++ b/src/Entities/Floater.cpp @@ -25,7 +25,7 @@ public: m_HitEntity(NULL) { } - virtual bool Item(cEntity * a_Entity) override + virtual bool Item(cEntity * a_Entity) /*override*/ { if (!a_Entity->IsMob()) // Floaters can only pull mobs not other entities. { @@ -86,7 +86,7 @@ public: { } - bool Item(cEntity * a_Entity) override + bool Item(cEntity * a_Entity) /*override*/ { m_EntityExists = true; return false; diff --git a/src/Entities/Floater.h b/src/Entities/Floater.h index 96d77ac82..0bc231bb2 100644 --- a/src/Entities/Floater.h +++ b/src/Entities/Floater.h @@ -20,8 +20,8 @@ public: cFloater(double a_X, double a_Y, double a_Z, Vector3d a_Speed, int a_PlayerID, int a_CountDownTime); - virtual void SpawnOn(cClientHandle & a_Client) override; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; + virtual void SpawnOn(cClientHandle & a_Client) /*override*/; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; // tolua_begin bool CanPickup(void) const { return m_CanPickupItem; } diff --git a/src/Entities/GhastFireballEntity.h b/src/Entities/GhastFireballEntity.h index 3ed72d9ef..35f5136dd 100644 --- a/src/Entities/GhastFireballEntity.h +++ b/src/Entities/GhastFireballEntity.h @@ -29,9 +29,9 @@ protected: void Explode(int a_BlockX, int a_BlockY, int a_BlockZ); - // cProjectileEntity overrides: - virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; - virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override; + // cProjectileEntity /*override*/s: + virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/; + virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/; // TODO: Deflecting the fireballs by arrow- or sword- hits diff --git a/src/Entities/HangingEntity.h b/src/Entities/HangingEntity.h index 3593f9ede..44c9d29c3 100644 --- a/src/Entities/HangingEntity.h +++ b/src/Entities/HangingEntity.h @@ -37,8 +37,8 @@ public: private: - virtual void SpawnOn(cClientHandle & a_ClientHandle) override; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override {} + virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/ {} eBlockFace m_BlockFace; diff --git a/src/Entities/ItemFrame.h b/src/Entities/ItemFrame.h index a63b78b70..09652bf84 100644 --- a/src/Entities/ItemFrame.h +++ b/src/Entities/ItemFrame.h @@ -34,9 +34,9 @@ public: private: - virtual void OnRightClicked(cPlayer & a_Player) override; - virtual void KilledBy(TakeDamageInfo & a_TDI) override; - virtual void GetDrops(cItems & a_Items, cEntity * a_Killer) override; + virtual void OnRightClicked(cPlayer & a_Player) /*override*/; + virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/; + virtual void GetDrops(cItems & a_Items, cEntity * a_Killer) /*override*/; cItem m_Item; Byte m_Rotation; diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp index d4eadc5d5..58736f040 100644 --- a/src/Entities/Minecart.cpp +++ b/src/Entities/Minecart.cpp @@ -2,7 +2,7 @@ // Minecart.cpp // Implements the cMinecart class representing a minecart in the world -// Handles physics when a minecart is on any type of rail (overrides simulator in Entity.cpp) +// Handles physics when a minecart is on any type of rail (/*override*/s simulator in Entity.cpp) // Indiana Jones! #include "Globals.h" @@ -34,7 +34,7 @@ public: { } - virtual bool Item(cEntity * a_Entity) override + virtual bool Item(cEntity * a_Entity) /*override*/ { ASSERT(a_Entity != NULL); @@ -177,7 +177,7 @@ void cMinecart::HandlePhysics(float a_Dt, cChunk & a_Chunk) else { // Not on rail, default physics - SetPosY(floor(GetPosY()) + 0.35); // HandlePhysics overrides this if minecart can fall, else, it is to stop ground clipping minecart bottom when off-rail + SetPosY(floor(GetPosY()) + 0.35); // HandlePhysics /*override*/s this if minecart can fall, else, it is to stop ground clipping minecart bottom when off-rail super::HandlePhysics(a_Dt, *Chunk); } diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h index 410d3c77d..b9779f531 100644 --- a/src/Entities/Minecart.h +++ b/src/Entities/Minecart.h @@ -34,11 +34,11 @@ public: // TODO: Spawner minecarts, (and possibly any block in a minecart with NBT editing) } ; - // cEntity overrides: - virtual void SpawnOn(cClientHandle & a_ClientHandle) override; - virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override; - virtual bool DoTakeDamage(TakeDamageInfo & TDI) override; - virtual void Destroyed() override; + // cEntity /*override*/s: + virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/; + virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) /*override*/; + virtual bool DoTakeDamage(TakeDamageInfo & TDI) /*override*/; + virtual void Destroyed() /*override*/; int LastDamage(void) const { return m_LastDamage; } ePayload GetPayload(void) const { return m_Payload; } @@ -95,8 +95,8 @@ public: const cItem & GetContent(void) const {return m_Content;} int GetBlockHeight(void) const {return m_Height;} - // cEntity overrides: - virtual void OnRightClicked(cPlayer & a_Player) override; + // cEntity /*override*/s: + virtual void OnRightClicked(cPlayer & a_Player) /*override*/; protected: cItem m_Content; @@ -130,8 +130,8 @@ protected: /// The chest contents: cItem m_Items[NumSlots]; - // cEntity overrides: - virtual void OnRightClicked(cPlayer & a_Player) override; + // cEntity /*override*/s: + virtual void OnRightClicked(cPlayer & a_Player) /*override*/; } ; @@ -148,9 +148,9 @@ public: cMinecartWithFurnace(double a_X, double a_Y, double a_Z); - // cEntity overrides: - virtual void OnRightClicked(cPlayer & a_Player) override; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; + // cEntity /*override*/s: + virtual void OnRightClicked(cPlayer & a_Player) /*override*/; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; // Set functions. void SetIsFueled(bool a_IsFueled, int a_FueledTimeLeft = -1) {m_IsFueled = a_IsFueled; m_FueledTimeLeft = a_FueledTimeLeft;} diff --git a/src/Entities/Painting.h b/src/Entities/Painting.h index 9877c95c5..3bb4b0bbf 100644 --- a/src/Entities/Painting.h +++ b/src/Entities/Painting.h @@ -23,10 +23,10 @@ public: private: - virtual void SpawnOn(cClientHandle & a_Client) override; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; - virtual void GetDrops(cItems & a_Items, cEntity * a_Killer) override; - virtual void KilledBy(TakeDamageInfo & a_TDI) override + virtual void SpawnOn(cClientHandle & a_Client) /*override*/; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; + virtual void GetDrops(cItems & a_Items, cEntity * a_Killer) /*override*/; + virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/ { super::KilledBy(a_TDI); Destroy(); diff --git a/src/Entities/Pawn.h b/src/Entities/Pawn.h index d50bcd8af..120b44ed4 100644 --- a/src/Entities/Pawn.h +++ b/src/Entities/Pawn.h @@ -20,8 +20,8 @@ public: cPawn(eEntityType a_EntityType, double a_Width, double a_Height); - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; - virtual void KilledBy(TakeDamageInfo & a_TDI) override; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; + virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/; // tolua_begin diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp index aab534f41..9f07d2fa0 100644 --- a/src/Entities/Pickup.cpp +++ b/src/Entities/Pickup.cpp @@ -28,7 +28,7 @@ public: { } - virtual bool Item(cEntity * a_Entity) override + virtual bool Item(cEntity * a_Entity) /*override*/ { if (!a_Entity->IsPickup() || (a_Entity->GetUniqueID() <= m_Pickup->GetUniqueID()) || a_Entity->IsDestroyed()) { diff --git a/src/Entities/Pickup.h b/src/Entities/Pickup.h index 4d5250819..5b2986c92 100644 --- a/src/Entities/Pickup.h +++ b/src/Entities/Pickup.h @@ -30,11 +30,11 @@ public: cItem & GetItem(void) {return m_Item; } // tolua_export const cItem & GetItem(void) const {return m_Item; } - virtual void SpawnOn(cClientHandle & a_ClientHandle) override; + virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/; bool CollectedBy(cPlayer * a_Dest); // tolua_export - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; /** Returns the number of ticks that this entity has existed */ int GetAge(void) const { return (int)(m_Timer / 50); } // tolua_export diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 32290885d..7dd46b73c 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -2057,7 +2057,7 @@ void cPlayer::HandleFloater() public cEntityCallback { public: - virtual bool Item(cEntity * a_Entity) override + virtual bool Item(cEntity * a_Entity) /*override*/ { a_Entity->Destroy(true); return true; diff --git a/src/Entities/Player.h b/src/Entities/Player.h index d3ed1ef9d..553d12a80 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -45,26 +45,26 @@ public: virtual ~cPlayer(); - virtual void SpawnOn(cClientHandle & a_Client) override; + virtual void SpawnOn(cClientHandle & a_Client) /*override*/; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; - virtual void HandlePhysics(float a_Dt, cChunk &) override { UNUSED(a_Dt); } + virtual void HandlePhysics(float a_Dt, cChunk &) /*override*/ { UNUSED(a_Dt); } /** Returns the curently equipped weapon; empty item if none */ - virtual cItem GetEquippedWeapon(void) const override { return m_Inventory.GetEquippedItem(); } + virtual cItem GetEquippedWeapon(void) const /*override*/ { return m_Inventory.GetEquippedItem(); } /** Returns the currently equipped helmet; empty item if none */ - virtual cItem GetEquippedHelmet(void) const override { return m_Inventory.GetEquippedHelmet(); } + virtual cItem GetEquippedHelmet(void) const /*override*/ { return m_Inventory.GetEquippedHelmet(); } /** Returns the currently equipped chestplate; empty item if none */ - virtual cItem GetEquippedChestplate(void) const override { return m_Inventory.GetEquippedChestplate(); } + virtual cItem GetEquippedChestplate(void) const /*override*/ { return m_Inventory.GetEquippedChestplate(); } /** Returns the currently equipped leggings; empty item if none */ - virtual cItem GetEquippedLeggings(void) const override { return m_Inventory.GetEquippedLeggings(); } + virtual cItem GetEquippedLeggings(void) const /*override*/ { return m_Inventory.GetEquippedLeggings(); } /** Returns the currently equipped boots; empty item if none */ - virtual cItem GetEquippedBoots(void) const override { return m_Inventory.GetEquippedBoots(); } + virtual cItem GetEquippedBoots(void) const /*override*/ { return m_Inventory.GetEquippedBoots(); } // tolua_begin @@ -135,7 +135,7 @@ public: /** Returns whether the player is climbing (ladders, vines etc.) */ bool IsClimbing(void) const; - virtual void TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ) override; + virtual void TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ) /*override*/; // tolua_begin @@ -266,7 +266,7 @@ public: void TossPickup(const cItem & a_Item); /** Heals the player by the specified amount of HPs (positive only); sends health update */ - virtual void Heal(int a_Health) override; + virtual void Heal(int a_Health) /*override*/; int GetFoodLevel (void) const { return m_FoodLevel; } double GetFoodSaturationLevel (void) const { return m_FoodSaturationLevel; } @@ -317,9 +317,9 @@ public: /** Aborts the current eating operation */ void AbortEating(void); - virtual void KilledBy(TakeDamageInfo & a_TDI) override; + virtual void KilledBy(TakeDamageInfo & a_TDI) /*override*/; - virtual void Killed(cEntity * a_Victim) override; + virtual void Killed(cEntity * a_Victim) /*override*/; void Respawn(void); // tolua_export @@ -328,7 +328,7 @@ public: /** Moves the player to the specified world. Returns true if successful, false on failure (world not found). */ - virtual bool DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn) override; + virtual bool DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn) /*override*/; /** Saves all player data, such as inventory, to JSON */ bool SaveToDisk(void); @@ -424,7 +424,7 @@ public: // tolua_end - // cEntity overrides: + // cEntity /*override*/s: virtual bool IsCrouched (void) const { return m_IsCrouched; } virtual bool IsSprinting(void) const { return m_IsSprinting; } virtual bool IsRclking (void) const { return IsEating() || IsChargingBow(); } @@ -557,7 +557,7 @@ protected: AString m_UUID; /** Sets the speed and sends it to the client, so that they are forced to move so. */ - virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ) override; + virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ) /*override*/; void ResolvePermissions(void); void ResolveGroups(void); @@ -565,10 +565,10 @@ protected: virtual void Destroyed(void); /** Filters out damage for creative mode/friendly fire */ - virtual bool DoTakeDamage(TakeDamageInfo & TDI) override; + virtual bool DoTakeDamage(TakeDamageInfo & TDI) /*override*/; /** Stops players from burning in creative mode */ - virtual void TickBurning(cChunk & a_Chunk) override; + virtual void TickBurning(cChunk & a_Chunk) /*override*/; /** Called in each tick to handle food-related processing */ void HandleFood(void); diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp index 43023ec28..a359563f5 100644 --- a/src/Entities/ProjectileEntity.cpp +++ b/src/Entities/ProjectileEntity.cpp @@ -55,8 +55,8 @@ protected: cProjectileEntity * m_Projectile; double m_SlowdownCoeff; - // cCallbacks overrides: - virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override + // cCallbacks /*override*/s: + virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) /*override*/ { /* // DEBUG: @@ -140,7 +140,7 @@ public: } - virtual bool Item(cEntity * a_Entity) override + virtual bool Item(cEntity * a_Entity) /*override*/ { if ( (a_Entity == m_Projectile) || // Do not check collisions with self diff --git a/src/Entities/ProjectileEntity.h b/src/Entities/ProjectileEntity.h index 0ebc32f36..80c13cb82 100644 --- a/src/Entities/ProjectileEntity.h +++ b/src/Entities/ProjectileEntity.h @@ -115,9 +115,9 @@ protected: /// True if the projectile has hit the ground and is stuck there bool m_IsInGround; - // cEntity overrides: - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; - virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override; - virtual void SpawnOn(cClientHandle & a_Client) override; + // cEntity /*override*/s: + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; + virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) /*override*/; + virtual void SpawnOn(cClientHandle & a_Client) /*override*/; } ; // tolua_export diff --git a/src/Entities/SplashPotionEntity.cpp b/src/Entities/SplashPotionEntity.cpp index fd1a0179b..73addfc85 100644 --- a/src/Entities/SplashPotionEntity.cpp +++ b/src/Entities/SplashPotionEntity.cpp @@ -31,7 +31,7 @@ public: } /** Called by cWorld::ForEachEntity(), adds the stored entity effect to the entity, if it is close enough. */ - virtual bool Item(cEntity * a_Entity) override + virtual bool Item(cEntity * a_Entity) /*override*/ { if (!a_Entity->IsPawn()) { diff --git a/src/Entities/SplashPotionEntity.h b/src/Entities/SplashPotionEntity.h index 4afc5f204..97e847b2c 100644 --- a/src/Entities/SplashPotionEntity.h +++ b/src/Entities/SplashPotionEntity.h @@ -47,10 +47,10 @@ protected: int m_PotionColor; - // cProjectileEntity overrides: - virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; - virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override; - virtual void Tick (float a_Dt, cChunk & a_Chunk) override + // cProjectileEntity /*override*/s: + virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/; + virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/; + virtual void Tick (float a_Dt, cChunk & a_Chunk) /*override*/ { if (m_DestroyTimer > 0) { @@ -71,7 +71,7 @@ protected: @param a_HitPos The position where the potion will splash */ void Splash(const Vector3d & a_HitPos); - virtual void SpawnOn(cClientHandle & a_Client) override; + virtual void SpawnOn(cClientHandle & a_Client) /*override*/; private: /** Time in ticks to wait for the hit animation to begin before destroying */ diff --git a/src/Entities/TNTEntity.h b/src/Entities/TNTEntity.h index 48503cf76..a51307484 100644 --- a/src/Entities/TNTEntity.h +++ b/src/Entities/TNTEntity.h @@ -19,9 +19,9 @@ public: cTNTEntity(double a_X, double a_Y, double a_Z, int a_FuseTicks = 80); cTNTEntity(const Vector3d & a_Pos, int a_FuseTicks = 80); - // cEntity overrides: - virtual void SpawnOn(cClientHandle & a_ClientHandle) override; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; + // cEntity /*override*/s: + virtual void SpawnOn(cClientHandle & a_ClientHandle) /*override*/; + virtual void Tick(float a_Dt, cChunk & a_Chunk) /*override*/; // tolua_begin diff --git a/src/Entities/ThrownEggEntity.h b/src/Entities/ThrownEggEntity.h index a0b7d5340..187a05eab 100644 --- a/src/Entities/ThrownEggEntity.h +++ b/src/Entities/ThrownEggEntity.h @@ -27,10 +27,10 @@ public: protected: - // cProjectileEntity overrides: - virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; - virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override; - virtual void Tick (float a_Dt, cChunk & a_Chunk) override + // cProjectileEntity /*override*/s: + virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/; + virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/; + virtual void Tick (float a_Dt, cChunk & a_Chunk) /*override*/ { if (m_DestroyTimer > 0) { diff --git a/src/Entities/ThrownEnderPearlEntity.cpp b/src/Entities/ThrownEnderPearlEntity.cpp index c7407e6ae..8209e0f47 100644 --- a/src/Entities/ThrownEnderPearlEntity.cpp +++ b/src/Entities/ThrownEnderPearlEntity.cpp @@ -61,7 +61,7 @@ void cThrownEnderPearlEntity::TeleportCreator(const Vector3d & a_HitPos) { } - virtual bool Item(cPlayer * a_Entity) override + virtual bool Item(cPlayer * a_Entity) /*override*/ { // Teleport the creator here, make them take 5 damage: a_Entity->TeleportToCoords(m_HitPos.x, m_HitPos.y + 0.2, m_HitPos.z); diff --git a/src/Entities/ThrownEnderPearlEntity.h b/src/Entities/ThrownEnderPearlEntity.h index 436450013..88a02a90e 100644 --- a/src/Entities/ThrownEnderPearlEntity.h +++ b/src/Entities/ThrownEnderPearlEntity.h @@ -27,10 +27,10 @@ public: protected: - // cProjectileEntity overrides: - virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; - virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override; - virtual void Tick (float a_Dt, cChunk & a_Chunk) override + // cProjectileEntity /*override*/s: + virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/; + virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/; + virtual void Tick (float a_Dt, cChunk & a_Chunk) /*override*/ { if (m_DestroyTimer > 0) { diff --git a/src/Entities/ThrownSnowballEntity.h b/src/Entities/ThrownSnowballEntity.h index 8d195ced1..811ea4ff1 100644 --- a/src/Entities/ThrownSnowballEntity.h +++ b/src/Entities/ThrownSnowballEntity.h @@ -27,10 +27,10 @@ public: protected: - // cProjectileEntity overrides: - virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; - virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override; - virtual void Tick (float a_Dt, cChunk & a_Chunk) override + // cProjectileEntity /*override*/s: + virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/; + virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/; + virtual void Tick (float a_Dt, cChunk & a_Chunk) /*override*/ { if (m_DestroyTimer > 0) { diff --git a/src/Entities/WitherSkullEntity.h b/src/Entities/WitherSkullEntity.h index c59acd807..a9e0cd575 100644 --- a/src/Entities/WitherSkullEntity.h +++ b/src/Entities/WitherSkullEntity.h @@ -28,8 +28,8 @@ public: protected: - // cProjectileEntity overrides: - virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override; - virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override; + // cProjectileEntity /*override*/s: + virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) /*override*/; + virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) /*override*/; } ; // tolua_export |