Set server_announce to world.mt and respect modes when changing subgame

[minetest.git] / src / content_sao.h

diff --git a/src/content_sao.h b/src/content_sao.h
index 9640e5f0883d4a40bb708ebc86f7593acea62fcc..f61566665310061e5b316536a52300988ff89e9a 100644 (file)
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -21,14 +21,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define CONTENT_SAO_HEADER
 
 #include "serverobject.h"
-#include "content_object.h"
 #include "itemgroup.h"
 #include "player.h"
 #include "object_properties.h"
 
-ServerActiveObject* createItemSAO(ServerEnvironment *env, v3f pos,
-               const std::string itemstring);
-
 /*
        LuaEntitySAO needs some internals exposed.
 */
@@ -37,11 +33,11 @@ class LuaEntitySAO : public ServerActiveObject
 {
 public:
        LuaEntitySAO(ServerEnvironment *env, v3f pos,
-                       const std::string &name, const std::string &state);
+                    const std::string &name, const std::string &state);
        ~LuaEntitySAO();
-       u8 getType() const
+       ActiveObjectType getType() const
        { return ACTIVEOBJECT_TYPE_LUAENTITY; }
-       u8 getSendType() const
+       ActiveObjectType getSendType() const
        { return ACTIVEOBJECT_TYPE_GENERIC; }
        virtual void addedToEnvironment(u32 dtime_s);
        static ServerActiveObject* create(ServerEnvironment *env, v3f pos,
@@ -62,9 +58,13 @@ class LuaEntitySAO : public ServerActiveObject
        void setHP(s16 hp);
        s16 getHP() const;
        void setArmorGroups(const ItemGroupList &armor_groups);
-       void setAnimation(v2f frame_range, float frame_speed, float frame_blend);
-       void setBonePosition(std::string bone, v3f position, v3f rotation);
-       void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation);
+       ItemGroupList getArmorGroups();
+       void setAnimation(v2f frame_range, float frame_speed, float frame_blend, bool frame_loop);
+       void getAnimation(v2f *frame_range, float *frame_speed, float *frame_blend, bool *frame_loop);
+       void setBonePosition(const std::string &bone, v3f position, v3f rotation);
+       void getBonePosition(const std::string &bone, v3f *position, v3f *rotation);
+       void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation);
+       void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation);
        ObjectProperties* accessObjectProperties();
        void notifyObjectPropertiesModified();
        /* LuaEntitySAO-specific */
@@ -106,6 +106,7 @@ class LuaEntitySAO : public ServerActiveObject
        v2f m_animation_range;
        float m_animation_speed;
        float m_animation_blend;
+       bool m_animation_loop;
        bool m_animation_sent;
 
        std::map<std::string, core::vector2d<v3f> > m_bone_position;
@@ -124,30 +125,30 @@ class LuaEntitySAO : public ServerActiveObject
 
 class LagPool
 {
-       float pool;
-       float max;
+       float m_pool;
+       float m_max;
 public:
-       LagPool(): pool(15), max(15)
+       LagPool(): m_pool(15), m_max(15)
        {}
        void setMax(float new_max)
        {
-               max = new_max;
-               if(pool > new_max)
-                       pool = new_max;
+               m_max = new_max;
+               if(m_pool > new_max)
+                       m_pool = new_max;
        }
        void add(float dtime)
        {
-               pool -= dtime;
-               if(pool < 0)
-                       pool = 0;
+               m_pool -= dtime;
+               if(m_pool < 0)
+                       m_pool = 0;
        }
        bool grab(float dtime)
        {
                if(dtime <= 0)
                        return true;
-               if(pool + dtime > max)
+               if(m_pool + dtime > m_max)
                        return false;
-               pool += dtime;
+               m_pool += dtime;
                return true;
        }
 };
@@ -158,9 +159,9 @@ class PlayerSAO : public ServerActiveObject
        PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
                        const std::set<std::string> &privs, bool is_singleplayer);
        ~PlayerSAO();
-       u8 getType() const
+       ActiveObjectType getType() const
        { return ACTIVEOBJECT_TYPE_PLAYER; }
-       u8 getSendType() const
+       ActiveObjectType getSendType() const
        { return ACTIVEOBJECT_TYPE_GENERIC; }
        std::string getDescription();
 
@@ -171,7 +172,6 @@ class PlayerSAO : public ServerActiveObject
        void addedToEnvironment(u32 dtime_s);
        void removingFromEnvironment();
        bool isStaticAllowed() const;
-       bool unlimitedTransferDistance() const;
        std::string getClientInitializationData(u16 protocol_version);
        std::string getStaticData();
        bool isAttached();
@@ -193,14 +193,21 @@ class PlayerSAO : public ServerActiveObject
        void rightClick(ServerActiveObject *clicker);
        s16 getHP() const;
        void setHP(s16 hp);
+       s16 readDamage();
        u16 getBreath() const;
        void setBreath(u16 breath);
        void setArmorGroups(const ItemGroupList &armor_groups);
-       void setAnimation(v2f frame_range, float frame_speed, float frame_blend);
-       void setBonePosition(std::string bone, v3f position, v3f rotation);
-       void setAttachment(int parent_id, std::string bone, v3f position, v3f rotation);
+       ItemGroupList getArmorGroups();
+       void setAnimation(v2f frame_range, float frame_speed, float frame_blend, bool frame_loop);
+       void getAnimation(v2f *frame_range, float *frame_speed, float *frame_blend, bool *frame_loop);
+       void setBonePosition(const std::string &bone, v3f position, v3f rotation);
+       void getBonePosition(const std::string &bone, v3f *position, v3f *rotation);
+       void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation);
+       void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation);
        ObjectProperties* accessObjectProperties();
        void notifyObjectPropertiesModified();
+       void setNametagColor(video::SColor color);
+       video::SColor getNametagColor();
 
        /*
                Inventory interface
@@ -209,7 +216,6 @@ class PlayerSAO : public ServerActiveObject
        Inventory* getInventory();
        const Inventory* getInventory() const;
        InventoryLocation getInventoryLocation() const;
-       void setInventoryModified();
        std::string getWieldList() const;
        int getWieldIndex() const;
        void setWieldIndex(int i);
@@ -262,7 +268,8 @@ class PlayerSAO : public ServerActiveObject
        {
                return m_dig_pool;
        }
-       void checkMovementCheat();
+       // Returns true if cheated
+       bool checkMovementCheat();
 
        // Other
 
@@ -282,6 +289,7 @@ class PlayerSAO : public ServerActiveObject
        Player *m_player;
        u16 m_peer_id;
        Inventory *m_inventory;
+       s16 m_damage;
 
        // Cheat prevention
        LagPool m_dig_pool;
@@ -305,6 +313,7 @@ class PlayerSAO : public ServerActiveObject
        v2f m_animation_range;
        float m_animation_speed;
        float m_animation_blend;
+       bool m_animation_loop;
        bool m_animation_sent;
 
        std::map<std::string, core::vector2d<v3f> > m_bone_position; // Stores position and rotation for each bone name
@@ -316,17 +325,15 @@ class PlayerSAO : public ServerActiveObject
        v3f m_attachment_rotation;
        bool m_attachment_sent;
 
-public:
-       // Some flags used by Server
-       bool m_moved;
-       bool m_inventory_not_sent;
-       bool m_hp_not_sent;
-       bool m_breath_not_sent;
-       bool m_wielded_item_not_sent;
+       video::SColor m_nametag_color;
+       bool m_nametag_sent;
 
+public:
        float m_physics_override_speed;
        float m_physics_override_jump;
        float m_physics_override_gravity;
+       bool m_physics_override_sneak;
+       bool m_physics_override_sneak_glitch;
        bool m_physics_override_sent;
 };