ServerRemotePlayer implements ServerActiveObject

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

diff --git a/src/serverobject.h b/src/serverobject.h
index a9bd0a7c4afc38b3d375f1b5cb56063222dda4ea..66118cca021460985eb146e8702f4e4b51f9200d 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,11 @@ 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();
 
+       virtual void addedToEnvironment(u16 id);
+       
        // Create a certain type of ServerActiveObject
        static ServerActiveObject* create(u8 type,
                        ServerEnvironment *env, u16 id, v3f pos,
@@ -62,13 +64,23 @@ 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; }
+
        /*
                Step object in time.
                Messages added to messages are sent to client over network.
@@ -111,6 +123,8 @@ public:
        /*
        */
        virtual void rightClick(Player *player){}
+
+       virtual bool isPeaceful(){return true;}
        
        /*
                Number of players which know about this object. Object won't be
@@ -158,7 +172,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);