From 37276a4430e26f5b3ab56e07d5f30a194f75982e Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 1 Jul 2013 10:39:56 +0000 Subject: Rewritten entity-on-fire management ("forever on fire" bugs) Fixes FS #297 and part of FS #403. Added sizes to all entities. Moved all damage-related functions from cPawn to cEntity API change: renamed cPawn:TeleportTo() to cEntity:TeleportToCoords() git-svn-id: http://mc-server.googlecode.com/svn/trunk@1635 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Player.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/Player.h') diff --git a/source/Player.h b/source/Player.h index f2eb2320d..f36545a4c 100644 --- a/source/Player.h +++ b/source/Player.h @@ -61,8 +61,8 @@ public: void SetTouchGround( bool a_bTouchGround ); inline void SetStance( const double a_Stance ) { m_Stance = a_Stance; } - double GetEyeHeight(); // tolua_export - Vector3d GetEyePosition(); // tolua_export + double GetEyeHeight(void) const; // tolua_export + Vector3d GetEyePosition(void) const; // tolua_export inline bool IsOnGround(void) const {return m_bTouchGround; } // tolua_export inline const 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 @@ -70,7 +70,7 @@ public: inline const cItem & GetEquippedItem(void) const { return GetInventory().GetEquippedItem(); } // tolua_export - virtual void TeleportTo(double a_PosX, double a_PosY, double a_PosZ) override; + virtual void TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ) override; eGameMode GetGameMode(void) const { return m_GameMode; } // tolua_export std::string GetIP() { return m_IP; } // tolua_export @@ -138,7 +138,7 @@ public: void AddFoodExhaustion(float a_Exhaustion) { m_FoodExhaustionLevel += a_Exhaustion; } // tolua_export - virtual void KilledBy(cPawn * a_Killer) override; + virtual void KilledBy(cEntity * a_Killer) override; void Respawn(void); // tolua_export -- cgit v1.2.3