diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-29 12:36:38 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-29 12:36:38 +0200 |
commit | dde641ce83de474187102f0efbbced826673f54d (patch) | |
tree | cfa07264ef4762567c3ebf504e368e3c330ad6fc /src/Entities/Player.h | |
parent | Merge pull request #1136 from Howaner/GlobalFixes (diff) | |
download | cuberite-dde641ce83de474187102f0efbbced826673f54d.tar cuberite-dde641ce83de474187102f0efbbced826673f54d.tar.gz cuberite-dde641ce83de474187102f0efbbced826673f54d.tar.bz2 cuberite-dde641ce83de474187102f0efbbced826673f54d.tar.lz cuberite-dde641ce83de474187102f0efbbced826673f54d.tar.xz cuberite-dde641ce83de474187102f0efbbced826673f54d.tar.zst cuberite-dde641ce83de474187102f0efbbced826673f54d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Entities/Player.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 2f7957f16..c70733c8c 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -124,6 +124,9 @@ public: 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; } + + /** Gets the contents of the player's associated enderchest */ + cItemGrid & GetEnderChestContents(void) { return m_EnderChestContents; } inline const cItem & GetEquippedItem(void) const { return GetInventory().GetEquippedItem(); } // tolua_export @@ -449,7 +452,13 @@ protected: float m_LastGroundHeight; bool m_bTouchGround; double m_Stance; + + /** Stores the player's inventory, consisting of crafting grid, hotbar, and main slots */ cInventory m_Inventory; + + /** An item grid that stores the player specific enderchest contents */ + cItemGrid m_EnderChestContents; + cWindow * m_CurrentWindow; cWindow * m_InventoryWindow; @@ -510,8 +519,6 @@ protected: cStatManager m_Stats; - - /** Sets the speed and sends it to the client, so that they are forced to move so. */ virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ) override; |