utility.h: Change Buffer's interface to be more compatible with SharedBuffer's interf...

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

diff --git a/src/content_sao.h b/src/content_sao.h
index e5b1223d466c68c54bf221d6ceff5c1beb2dde85..f0ebf4f6fbe3b02822ba35d3e74f08b785835b84 100644 (file)
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -51,6 +51,7 @@ public:
        std::string getStaticData();
        InventoryItem* createInventoryItem();
        InventoryItem* createPickedUpItem(){return createInventoryItem();}
+       void rightClick(Player *player);
 private:
        std::string m_inventorystring;
        v3f m_speed_f;
@@ -95,7 +96,9 @@ public:
        std::string getClientInitializationData();
        std::string getStaticData();
        InventoryItem* createPickedUpItem(){return NULL;}
-       u16 punch(const std::string &toolname, v3f dir);
+       u16 punch(const std::string &toolname, v3f dir,
+                       const std::string &playername);
+       bool isPeaceful(){return false;}
 private:
        void doDamage(u16 d);
 
@@ -138,5 +141,59 @@ private:
        bool m_touching_ground;
 };
 
+class Settings;
+
+class MobV2SAO : public ServerActiveObject
+{
+public:
+       MobV2SAO(ServerEnvironment *env, u16 id, v3f pos,
+                       Settings *init_properties);
+       virtual ~MobV2SAO();
+       u8 getType() const
+               {return ACTIVEOBJECT_TYPE_MOBV2;}
+       static ServerActiveObject* create(ServerEnvironment *env, u16 id, v3f pos,
+                       const std::string &data);
+       std::string getStaticData();
+       std::string getClientInitializationData();
+       void step(float dtime, bool send_recommended);
+       InventoryItem* createPickedUpItem(){return NULL;}
+       u16 punch(const std::string &toolname, v3f dir,
+                       const std::string &playername);
+       bool isPeaceful();
+private:
+       void sendPosition();
+       void setPropertyDefaults();
+       void readProperties();
+       void updateProperties();
+       void doDamage(u16 d);
+       
+       std::string m_move_type;
+       v3f m_speed;
+       v3f m_last_sent_position;
+       v3f m_oldpos;
+       float m_yaw;
+       float m_counter1;
+       float m_counter2;
+       float m_age;
+       bool m_touching_ground;
+       int m_hp;
+       bool m_walk_around;
+       float m_walk_around_timer;
+       bool m_next_pos_exists;
+       v3s16 m_next_pos_i;
+       float m_shoot_reload_timer;
+       bool m_shooting;
+       float m_shooting_timer;
+       float m_die_age;
+       v2f m_size;
+       bool m_falling;
+       float m_disturb_timer;
+       std::string m_disturbing_player;
+       float m_random_disturb_timer;
+       float m_shoot_y;
+       
+       Settings *m_properties;
+};
+
 #endif