Tuned polygon generation to sort the triangles for nicer gradients

[minetest.git] / src / serverobject.h

diff --git a/src/serverobject.h b/src/serverobject.h
index 76f7d01d678b8159b783eacc93f31b224210e049..71199475e4936ca28a2ae11a71b75cfa8a0cfd8d 100644 (file)
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -40,38 +40,6 @@ 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;
 
@@ -132,6 +100,12 @@ class ServerActiveObject : public ActiveObject
        */
        virtual InventoryItem* createPickedUpItem(){return NULL;}
        
+       /*
+               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
        u16 m_known_by_count;
        /*
@@ -204,6 +178,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
@@ -220,6 +195,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;
@@ -228,6 +232,7 @@ class RatSAO : public ServerActiveObject
        float m_counter2;
        float m_age;
        bool m_touching_ground;
+       u8 m_hp;
 };
 
 #endif