From 1e9af56a67ae3765291361d9bf01e9009cfb4dcc Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Wed, 28 Dec 2011 02:10:05 +0000 Subject: - Implemented Drops from Burning animals - added right monster health and attack strength - refactored the Pawn/Monster/Player class a little bit - changed some namings to fit the style git-svn-id: http://mc-server.googlecode.com/svn/trunk@140 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cPlayer.h | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) (limited to 'source/cPlayer.h') diff --git a/source/cPlayer.h b/source/cPlayer.h index 621b1031c..b0d446434 100644 --- a/source/cPlayer.h +++ b/source/cPlayer.h @@ -28,21 +28,21 @@ public: inline bool GetFlying() { return m_bTouchGround; } //tolua_export inline const double & GetStance() { return m_Stance; } //tolua_export cInventory & GetInventory() { return *m_Inventory; } //tolua_export - virtual void TeleportTo( cEntity* a_Entity ); //tolua_export - virtual void TeleportTo( const double & a_PosX, const double & a_PosY, const double & a_PosZ ); //tolua_export - - int GetGameMode() { return m_GameMode; } //tolua_export - std::string GetIP() { return m_IP; } //tolua_export - float GetLastBlockActionTime() { return m_LastBlockActionTime; } //tolua_export - int GetLastBlockActionCnt() { return m_LastBlockActionCnt; } //tolua_export - void SetLastBlockActionCnt( int ); //tolua_export - void SetLastBlockActionTime(); //tolua_export - void SetGameMode( int a_GameMode ); //tolua_export + + virtual void TeleportTo( const double & a_PosX, const double & a_PosY, const double & a_PosZ ); //tolua_export + + int GetGameMode() { return m_GameMode; } //tolua_export + std::string GetIP() { return m_IP; } //tolua_export + float GetLastBlockActionTime() { return m_LastBlockActionTime; } //tolua_export + int GetLastBlockActionCnt() { return m_LastBlockActionCnt; } //tolua_export + void SetLastBlockActionCnt( int ); //tolua_export + void SetLastBlockActionTime(); //tolua_export + void SetGameMode( int a_GameMode ); //tolua_export void LoginSetGameMode( int a_GameMode ); void SetIP( std::string a_IP ); // Tries to move to a new position, with collision checks and stuff - virtual void MoveTo( const Vector3d & a_NewPos ); //tolua_export + virtual void MoveTo( const Vector3d & a_NewPos ); //tolua_export cWindow* GetWindow() { return m_CurrentWindow; } void OpenWindow( cWindow* a_Window ); @@ -81,12 +81,7 @@ public: bool LoadFromDisk(); const char* GetLoadedWorldName(); - - //Burning logic - bool m_bBurnable; - enum PMetaState{NORMAL,BURNING,CROUCHED,RIDING} e_EPMetaState; - virtual void CheckMetaDataBurn(); - virtual void InStateBurning(float a_Dt); + protected: struct sPlayerState; @@ -106,8 +101,6 @@ protected: void ResolveGroups(); char m_Color; - float m_FireDamageInterval; - float m_BurnPeriod; float m_LastBlockActionTime; int m_LastBlockActionCnt; -- cgit v1.2.3