diff options
| author | tycho <work.tycho@gmail.com> | 2015-05-23 16:33:52 +0200 |
|---|---|---|
| committer | tycho <work.tycho@gmail.com> | 2015-05-23 16:33:52 +0200 |
| commit | 81c0116cf1c0b06e24f9f69e219c3f1e302d81e2 (patch) | |
| tree | 8df120fde19c9c27f5a8681a7952aa9e802bc800 /src/Entities/Player.h | |
| parent | Merge branch 'master' into PreventNewWarnings (diff) | |
| parent | Merge pull request #2117 from Seadragon91/clang_errors (diff) | |
| download | cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.gz cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.bz2 cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.lz cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.xz cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.zst cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.zip | |
Diffstat (limited to 'src/Entities/Player.h')
| -rw-r--r-- | src/Entities/Player.h | 10 |
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; |