ServerRemotePlayer implements ServerActiveObject

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

diff --git a/src/serverobject.h b/src/serverobject.h
index 955969819e2befa9fb9eb348fb08f5fad9c5aef5..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"
 
@@ -42,6 +42,7 @@ Some planning
 
 class ServerEnvironment;
 class InventoryItem;
+class Player;
 
 class ServerActiveObject : public ActiveObject
 {
@@ -50,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,
@@ -61,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.
@@ -78,8 +91,7 @@ public:
                        same time so that the data can be combined in a single
                        packet.
        */
-       virtual void step(float dtime, Queue<ActiveObjectMessage> &messages,
-                       bool send_recommended){}
+       virtual void step(float dtime, bool send_recommended){}
        
        /*
                The return value of this is passed to the client-side object
@@ -104,7 +116,15 @@ public:
                If the object doesn't return an item, this will be called.
                Return value is tool wear.
        */
-       virtual u16 punch(const std::string &toolname){return 0;}
+       virtual u16 punch(const std::string &toolname, v3f dir,
+                       const std::string &playername)
+       {return 0;}
+
+       /*
+       */
+       virtual void rightClick(Player *player){}
+
+       virtual bool isPeaceful(){return true;}
        
        /*
                Number of players which know about this object. Object won't be
@@ -144,10 +164,15 @@ public:
        */
        v3s16 m_static_block;
        
+       /*
+               Queue of messages to be sent to the client
+       */
+       Queue<ActiveObjectMessage> m_messages_out;
+       
 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);
 
@@ -159,96 +184,5 @@ private:
        static core::map<u16, Factory> m_types;
 };
 
-class TestSAO : public ServerActiveObject
-{
-public:
-       TestSAO(ServerEnvironment *env, u16 id, v3f pos);
-       u8 getType() const
-               {return ACTIVEOBJECT_TYPE_TEST;}
-       static ServerActiveObject* create(ServerEnvironment *env, u16 id, v3f pos,
-                       const std::string &data);
-       void step(float dtime, Queue<ActiveObjectMessage> &messages,
-                       bool send_recommended);
-private:
-       float m_timer1;
-       float m_age;
-};
-
-class ItemSAO : public ServerActiveObject
-{
-public:
-       ItemSAO(ServerEnvironment *env, u16 id, v3f pos,
-                       const std::string inventorystring);
-       u8 getType() const
-               {return ACTIVEOBJECT_TYPE_ITEM;}
-       static ServerActiveObject* create(ServerEnvironment *env, u16 id, v3f pos,
-                       const std::string &data);
-       void step(float dtime, Queue<ActiveObjectMessage> &messages,
-                       bool send_recommended);
-       std::string getClientInitializationData();
-       std::string getStaticData();
-       InventoryItem* createInventoryItem();
-       InventoryItem* createPickedUpItem(){return createInventoryItem();}
-private:
-       std::string m_inventorystring;
-       v3f m_speed_f;
-       v3f m_last_sent_position;
-       IntervalLimiter m_move_interval;
-};
-
-class RatSAO : public ServerActiveObject
-{
-public:
-       RatSAO(ServerEnvironment *env, u16 id, v3f pos);
-       u8 getType() const
-               {return ACTIVEOBJECT_TYPE_RAT;}
-       static ServerActiveObject* create(ServerEnvironment *env, u16 id, v3f pos,
-                       const std::string &data);
-       void step(float dtime, Queue<ActiveObjectMessage> &messages,
-                       bool send_recommended);
-       std::string getClientInitializationData();
-       std::string getStaticData();
-       InventoryItem* createPickedUpItem();
-private:
-       bool m_is_active;
-       IntervalLimiter m_inactive_interval;
-       v3f m_speed_f;
-       v3f m_oldpos;
-       v3f m_last_sent_position;
-       float m_yaw;
-       float m_counter1;
-       float m_counter2;
-       float m_age;
-       bool m_touching_ground;
-};
-
-class Oerkki1SAO : public ServerActiveObject
-{
-public:
-       Oerkki1SAO(ServerEnvironment *env, u16 id, v3f pos);
-       u8 getType() const
-               {return ACTIVEOBJECT_TYPE_OERKKI1;}
-       static ServerActiveObject* create(ServerEnvironment *env, u16 id, v3f pos,
-                       const std::string &data);
-       void step(float dtime, Queue<ActiveObjectMessage> &messages,
-                       bool send_recommended);
-       std::string getClientInitializationData();
-       std::string getStaticData();
-       InventoryItem* createPickedUpItem(){return NULL;}
-       u16 punch(const std::string &toolname);
-private:
-       bool m_is_active;
-       IntervalLimiter m_inactive_interval;
-       v3f m_speed_f;
-       v3f m_oldpos;
-       v3f m_last_sent_position;
-       float m_yaw;
-       float m_counter1;
-       float m_counter2;
-       float m_age;
-       bool m_touching_ground;
-       u8 m_hp;
-};
-
 #endif