Fix and tune stars

[oweals/minetest.git] / src / serverremoteplayer.h

diff --git a/src/serverremoteplayer.h b/src/serverremoteplayer.h
index bdc3bba208f5553edddb1112c6661962b3a899fe..2ff1b0013582189dae7c0f51b23e665dd06d82ab 100644 (file)
--- 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
@@ -70,29 +67,32 @@ public:
        void step(float dtime, bool send_recommended);
        std::string getClientInitializationData();
        std::string getStaticData();
-       void punch(ServerActiveObject *puncher, float time_from_last_punch);
+       int punch(v3f dir,
+                       const ToolCapabilities *toolcap,
+                       ServerActiveObject *puncher,
+                       float time_from_last_punch);
        void rightClick(ServerActiveObject *clicker);
        void setPos(v3f pos);
        void moveTo(v3f pos, bool continuous);
        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;
        bool m_is_in_environment;
        // Incremented by step(), read and reset by Server
        float m_time_from_last_punch;