Falling sand and gravel

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

diff --git a/src/serverobject.h b/src/serverobject.h
index a9bd0a7c4afc38b3d375f1b5cb56063222dda4ea..26dce007f510b03f8d9e2804a048799b14381849 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SERVEROBJECT_HEADER
 #define SERVEROBJECT_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 #include "activeobject.h"
 #include "utility.h"
 
@@ -51,9 +51,12 @@ public:
                NOTE: m_env can be NULL, but step() isn't called if it is.
                Prototypes are used that way.
        */
-       ServerActiveObject(ServerEnvironment *env, u16 id, v3f pos);
+       ServerActiveObject(ServerEnvironment *env, v3f pos);
        virtual ~ServerActiveObject();
 
+       // Call after id has been set and has been inserted in environment
+       virtual void addedToEnvironment();
+       
        // Create a certain type of ServerActiveObject
        static ServerActiveObject* create(u8 type,
                        ServerEnvironment *env, u16 id, v3f pos,
@@ -62,12 +65,27 @@ public:
        /*
                Some simple getters/setters
        */
-       v3f getBasePosition()
-               {return m_base_position;}
-       void setBasePosition(v3f pos)
-               {m_base_position = pos;}
-       ServerEnvironment* getEnv()
-               {return m_env;}
+       v3f getBasePosition(){ return m_base_position; }
+       void setBasePosition(v3f pos){ m_base_position = pos; }
+       ServerEnvironment* getEnv(){ return m_env; }
+       
+       /*
+               Some more dynamic interface
+       */
+       
+       virtual void setPos(v3f pos)
+               { setBasePosition(pos); }
+       // continuous: if true, object does not stop immediately at pos
+       virtual void moveTo(v3f pos, bool continuous)
+               { setBasePosition(pos); }
+       // If object has moved less than this and data has not changed,
+       // saving to disk may be omitted
+       virtual float getMinimumSavedMovement()
+               { return 2.0*BS; }
+       
+       virtual bool isPeaceful(){return true;}
+
+       virtual std::string getDescription(){return "SAO";}
        
        /*
                Step object in time.
@@ -94,24 +112,22 @@ public:
        */
        virtual std::string getStaticData(){return "";}
        
-       /*
-               Item that the player gets when this object is picked up.
-               If NULL, object cannot be picked up.
-       */
-       virtual InventoryItem* createPickedUpItem(){return NULL;}
+       virtual void punch(ServerActiveObject *puncher){}
+       virtual void rightClick(ServerActiveObject *clicker){}
        
-       /*
-               If the object doesn't return an item, this will be called.
-               Return value is tool wear.
-       */
-       virtual u16 punch(const std::string &toolname, v3f dir,
-                       const std::string &playername)
-       {return 0;}
+       // Returns a reference
+       virtual InventoryItem* getWieldedItem()
+               { return NULL; }
+       virtual void damageWieldedItem(u16 amount)
+               {}
+       // If all fits, eats item and returns true. Otherwise returns false.
+       virtual bool addToInventory(InventoryItem *item)
+               {return false;}
+       virtual void setHP(s16 hp)
+               {}
+       virtual s16 getHP()
+               {return 0;}
 
-       /*
-       */
-       virtual void rightClick(Player *player){}
-       
        /*
                Number of players which know about this object. Object won't be
                deleted until this is 0 to keep the id preserved for the right
@@ -158,7 +174,7 @@ public:
 protected:
        // Used for creating objects based on type
        typedef ServerActiveObject* (*Factory)
-                       (ServerEnvironment *env, u16 id, v3f pos,
+                       (ServerEnvironment *env, v3f pos,
                        const std::string &data);
        static void registerType(u16 type, Factory f);