flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

cPlayer should override IsOnGround()

Browse Source
This commit is contained in:
Howaner 2015-02-06 21:42:32 +01:00
parent 9b9ce6fa3b
commit 7813cd2022
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Entities/Entity.h
View File

@ -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

2
src/Entities/Player.h
View File

@ -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; }