summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2015-02-06 21:42:32 +0100
committerHowaner <franzi.moos@googlemail.com>2015-02-07 10:46:01 +0100
commit7813cd20222451f3f1f02b3264bb2d689006f95a (patch)
tree431cba4f4e13d4548b3189ed0c5498cf242d0994
parentAdded IsOnGround() to cEntity (diff)
downloadcuberite-7813cd20222451f3f1f02b3264bb2d689006f95a.tar
cuberite-7813cd20222451f3f1f02b3264bb2d689006f95a.tar.gz
cuberite-7813cd20222451f3f1f02b3264bb2d689006f95a.tar.bz2
cuberite-7813cd20222451f3f1f02b3264bb2d689006f95a.tar.lz
cuberite-7813cd20222451f3f1f02b3264bb2d689006f95a.tar.xz
cuberite-7813cd20222451f3f1f02b3264bb2d689006f95a.tar.zst
cuberite-7813cd20222451f3f1f02b3264bb2d689006f95a.zip
-rw-r--r--src/Entities/Entity.h4
-rw-r--r--src/Entities/Player.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 4a819fa4a..809e974d2 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -444,8 +444,8 @@ public:
/** Set the invulnerable ticks from the entity */
void SetInvulnerableTicks(int a_InvulnerableTicks) { m_InvulnerableTicks = a_InvulnerableTicks; }
- /** Returns whether the player is on ground or not */
- bool IsOnGround(void) const { return m_bOnGround; }
+ /** Returns whether the entity is on ground or not */
+ virtual bool IsOnGround(void) const { return m_bOnGround; }
// tolua_end
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index fa9ac7cad..47bff64f2 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -121,7 +121,7 @@ public:
inline void SetStance( const double a_Stance) { m_Stance = a_Stance; }
double GetEyeHeight(void) const; // tolua_export
Vector3d GetEyePosition(void) const; // tolua_export
- inline bool IsOnGround(void) const {return m_bTouchGround; } // tolua_export
+ virtual bool IsOnGround(void) const override {return m_bTouchGround; }
inline double GetStance(void) const { return GetPosY() + 1.62; } // tolua_export // TODO: Proper stance when crouching etc.
inline cInventory & GetInventory(void) { return m_Inventory; } // tolua_export
inline const cInventory & GetInventory(void) const { return m_Inventory; }