diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-19 21:42:32 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-19 21:42:32 +0200 |
| commit | 427e582d5fcbd5025a81a4e89ccada47877ccc64 (patch) | |
| tree | 1196585a1a6fdc39c6a05aa117cfa2766f7dca2f /source/cPlayer.h | |
| parent | Android: Do not create an input thread for Android (diff) | |
| download | cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.tar cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.tar.gz cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.tar.bz2 cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.tar.lz cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.tar.xz cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.tar.zst cuberite-427e582d5fcbd5025a81a4e89ccada47877ccc64.zip | |
Diffstat (limited to 'source/cPlayer.h')
| -rw-r--r-- | source/cPlayer.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/cPlayer.h b/source/cPlayer.h index a27070048..ba8e15880 100644 --- a/source/cPlayer.h +++ b/source/cPlayer.h @@ -35,12 +35,13 @@ public: virtual void Tick(float a_Dt) override; void SetTouchGround( bool a_bTouchGround ); - inline void SetStance( const double & a_Stance ) { m_Stance = a_Stance; } + inline void SetStance( const double a_Stance ) { m_Stance = a_Stance; } double GetEyeHeight(); //tolua_export Vector3d GetEyePosition(); //tolua_export + OBSOLETE inline bool GetFlying() { return m_bTouchGround; } //tolua_export inline bool IsOnGround(void) const {return m_bTouchGround; } // tolua_export - inline const double & GetStance() { return m_Stance; } //tolua_export + inline const double GetStance(void) const { return m_Pos.y + 1.62; } //tolua_export // TODO: Proper stance when crouching etc. inline cInventory & GetInventory() { if(GetGameMode() == eGameMode_Survival) return *m_Inventory; else return *m_CreativeInventory; } //tolua_export virtual void TeleportTo( const double & a_PosX, const double & a_PosY, const double & a_PosZ ); //tolua_export @@ -53,7 +54,7 @@ public: void SetLastBlockActionTime(); //tolua_export void SetGameMode( eGameMode a_GameMode ); //tolua_export void LoginSetGameMode( eGameMode a_GameMode ); - void SetIP( std::string a_IP ); + void SetIP(const AString & a_IP); // Tries to move to a new position, with collision checks and stuff virtual void MoveTo( const Vector3d & a_NewPos ); //tolua_export @@ -62,9 +63,9 @@ public: void OpenWindow( cWindow* a_Window ); void CloseWindow(char a_WindowType); - cClientHandle * GetClientHandle() { return m_ClientHandle; } //tolua_export + cClientHandle * GetClientHandle(void) const { return m_ClientHandle; } //tolua_export - void SendMessage( const char* a_Message ); //tolua_export + void SendMessage(const AString & a_Message); //tolua_export const AString & GetName(void) const { return m_PlayerName; } //tolua_export void SetName(const AString & a_Name) { m_PlayerName = a_Name; } //tolua_export |