diff options
Diffstat (limited to 'src/serverremoteplayer.h')
| -rw-r--r-- | src/serverremoteplayer.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/serverremoteplayer.h b/src/serverremoteplayer.h index bdc3bba20..9d9437646 100644 --- a/src/serverremoteplayer.h +++ b/src/serverremoteplayer.h @@ -46,9 +46,6 @@ public: virtual void setPosition(const v3f &position); - // Returns a reference - virtual InventoryItem* getWieldedItem(); - /* ServerActiveObject interface */ u8 getType() const @@ -77,19 +74,20 @@ public: virtual std::string getDescription() {return std::string("player ")+getName();} - virtual void getWieldDiggingProperties(ToolDiggingProperties *dst); - virtual void damageWieldedItem(u16 amount); - // If all fits, eats item and returns true. Otherwise returns false. - virtual bool addToInventory(InventoryItem *item); - virtual void addToInventoryLater(InventoryItem *item); - void clearAddToInventoryLater(); - void completeAddToInventoryLater(u16 preferred_index); + virtual Inventory* getInventory(); + virtual const Inventory* getInventory() const; + virtual InventoryLocation getInventoryLocation() const; + virtual void setInventoryModified(); + virtual std::string getWieldList() const; + virtual int getWieldIndex() const; + virtual void setWieldIndex(int i); + virtual void setHP(s16 hp_); virtual s16 getHP(); v3f m_last_good_position; float m_last_good_position_age; - std::vector<InventoryItem*> m_additional_items; + int m_wield_index; bool m_inventory_not_sent; bool m_hp_not_sent; bool m_respawn_active; |