diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-09-05 16:56:31 +0200 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-09-05 16:56:31 +0200 |
commit | 28f66efe307150558f4ad2546e058370a828be3e (patch) | |
tree | 2ef088aa2d1a8ae85007b34b463d5044847bf006 /src/Entities/SplashPotionEntity.h | |
parent | Merge branch 'master' into ComponentRewrite (diff) | |
download | cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.gz cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.bz2 cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.lz cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.xz cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.zst cuberite-28f66efe307150558f4ad2546e058370a828be3e.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Entities/SplashPotionEntity.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Entities/SplashPotionEntity.h b/src/Entities/SplashPotionEntity.h index 97e847b2c..4afc5f204 100644 --- a/src/Entities/SplashPotionEntity.h +++ b/src/Entities/SplashPotionEntity.h @@ -47,10 +47,10 @@ protected: int m_PotionColor; - // 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*/ + // 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 { 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 */ |