removed furnace menu because it is not needed anymore

[minetest.git] / src / serverobject.h

diff --git a/src/serverobject.h b/src/serverobject.h
index d3dabdd4d25c6c7fd03e1d97e86a0e6f5016267f..955969819e2befa9fb9eb348fb08f5fad9c5aef5 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -40,44 +40,16 @@ Some planning
 
 */
 
-#if 0
-class IntervalLimiter
-{
-public:
-       IntervalLimiter():
-               m_accumulator(0)
-       {
-       }
-       /*
-               dtime: time from last call to this method
-               wanted_interval: interval wanted
-               return value:
-                       true: action should be skipped
-                       false: action should be done and dtime has been set
-       */
-       bool step(float &dtime, float wanted_interval)
-       {
-               accumulator += dtime;
-               if(accumulator < wanted_interval)
-               {
-                       dtime = 0;
-                       return true;
-               }
-               accumulator -= wanted-interval;
-               dtime = wanted_interval;
-               return false;
-       }
-protected:
-       float m_accumulator;
-};
-#endif
-
 class ServerEnvironment;
 class InventoryItem;
 
 class ServerActiveObject : public ActiveObject
 {
 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);
        virtual ~ServerActiveObject();
 
@@ -101,7 +73,7 @@ class ServerActiveObject : public ActiveObject
                Messages added to messages are sent to client over network.
 
                send_recommended:
-                       True at around 5 times a second, same for all objects.
+                       True at around 5-10 times a second, same for all objects.
                        This is used to let objects send most of the data at the
                        same time so that the data can be combined in a single
                        packet.
@@ -128,8 +100,19 @@ class ServerActiveObject : public ActiveObject
        */
        virtual InventoryItem* createPickedUpItem(){return NULL;}
        
-       // Number of players which know about this object
+       /*
+               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;}
+       
+       /*
+               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
+               object.
+       */
        u16 m_known_by_count;
+
        /*
                - Whether this object is to be removed when nobody knows about
                  it anymore.
@@ -141,6 +124,16 @@ class ServerActiveObject : public ActiveObject
        */
        bool m_removed;
        
+       /*
+               This is set to true when a block 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, 
+       */
+       bool m_pending_deactivation;
+       
        /*
                Whether the object's static data has been stored to a block
        */
@@ -200,6 +193,7 @@ class ItemSAO : public ServerActiveObject
        std::string m_inventorystring;
        v3f m_speed_f;
        v3f m_last_sent_position;
+       IntervalLimiter m_move_interval;
 };
 
 class RatSAO : public ServerActiveObject
@@ -216,6 +210,35 @@ class RatSAO : public ServerActiveObject
        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;
@@ -224,6 +247,7 @@ class RatSAO : public ServerActiveObject
        float m_counter2;
        float m_age;
        bool m_touching_ground;
+       u8 m_hp;
 };
 
 #endif