Remove stuff made obsolete by making players more ActiveObject-like and raise protoco...

[dragonfireclient.git] / src / serverobject.h

diff --git a/src/serverobject.h b/src/serverobject.h
index b901cbf4d122404ce141baf11e6d026932c14f73..1386136cebdb6a7551476727a17cfe73c55df533 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -43,6 +43,7 @@ Some planning
 class ServerEnvironment;
 class InventoryItem;
 class Player;
+struct ToolDiggingProperties;
 
 class ServerActiveObject : public ActiveObject
 {
@@ -58,6 +59,10 @@ class ServerActiveObject : public ActiveObject
        virtual void addedToEnvironment(){};
        // Called before removing from environment
        virtual void removingFromEnvironment(){};
+       // Returns true if object's deletion is the job of the
+       // environment
+       virtual bool environmentDeletes() const
+       { return true; }
        
        // Create a certain type of ServerActiveObject
        static ServerActiveObject* create(u8 type,
@@ -112,30 +117,36 @@ class ServerActiveObject : public ActiveObject
                when it is created (converted from static to active - actually
                the data is the static form)
        */
-       virtual std::string getStaticData(){return "";}
+       virtual std::string getStaticData()
+       {
+               assert(isStaticAllowed());
+               return "";
+       }
        /*
                Return false in here to never save and instead remove object
                on unload. getStaticData() will not be called in that case.
        */
-       virtual bool isStaticAllowed(){return true;}
+       virtual bool isStaticAllowed() const
+       {return true;}
        
-       virtual void punch(ServerActiveObject *puncher){}
-       virtual void rightClick(ServerActiveObject *clicker){}
-       
-       // Returns a reference
-       virtual InventoryItem* getWieldedItem()
-               { return NULL; }
+       // time_from_last_punch is used for lessening damage if punching fast
+       virtual void punch(ServerActiveObject *puncher,
+                       float time_from_last_punch=1000000)
+       {}
+       virtual void rightClick(ServerActiveObject *clicker)
+       {}
+       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)
-               {return false;}
+       { return false; }
        virtual void addToInventoryLater(InventoryItem *item)
-               {}
+       {}
        virtual void setHP(s16 hp)
-               {}
+       {}
        virtual s16 getHP()
-               {return 0;}
+       { return 0; }
 
        /*
                Number of players which know about this object. Object won't be
@@ -156,12 +167,13 @@ class ServerActiveObject : public ActiveObject
        bool m_removed;
        
        /*
-               This is set to true when a block should be removed from the active
+               This is set to true when an object should be removed from the active
                object list but couldn't be removed because the id has to be
                reserved for some client.
 
                The environment checks this periodically. If this is true and also
-               m_known_by_count is true, 
+               m_known_by_count is true, object is deleted from the active object
+               list.
        */
        bool m_pending_deactivation;