summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.h
diff options
context:
space:
mode:
authorworktycho <work.tycho@gmail.com>2015-05-23 16:31:49 +0200
committerworktycho <work.tycho@gmail.com>2015-05-23 16:31:49 +0200
commit7e0dc0f9bc4c555c67a3dfe48669916259c16b5a (patch)
treeaaa204d290f99d1b6f251055f046e8e86c795bfd /src/Entities/Player.h
parentMerge pull request #2116 from mc-server/CMakeCacheOptions (diff)
parentFixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. (diff)
downloadcuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar
cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.gz
cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.bz2
cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.lz
cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.xz
cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.zst
cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.zip
Diffstat (limited to 'src/Entities/Player.h')
-rw-r--r--src/Entities/Player.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index a0cd9b1d6..579eb8748 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -483,11 +483,11 @@ public:
bool PlaceBlocks(const sSetBlockVector & a_Blocks);
// cEntity overrides:
- virtual bool IsCrouched (void) const { return m_IsCrouched; }
- virtual bool IsSprinting(void) const { return m_IsSprinting; }
- virtual bool IsRclking (void) const { return IsEating() || IsChargingBow(); }
+ virtual bool IsCrouched (void) const override { return m_IsCrouched; }
+ virtual bool IsSprinting(void) const override { return m_IsSprinting; }
+ virtual bool IsRclking (void) const override { return IsEating() || IsChargingBow(); }
- virtual void Detach(void);
+ virtual void Detach(void) override;
/** Called by cClientHandle when the client is being destroyed.
The player removes its m_ClientHandle ownership so that the ClientHandle gets deleted. */
@@ -642,7 +642,7 @@ protected:
void ResolvePermissions(void);
void ResolveGroups(void);
- virtual void Destroyed(void);
+ virtual void Destroyed(void) override;
/** Filters out damage for creative mode / friendly fire */
virtual bool DoTakeDamage(TakeDamageInfo & TDI) override;