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 d6a494ae2a6e38402870504131ddf95e99eb13e9..f61566665310061e5b316536a52300988ff89e9a 100644 (file)
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -58,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 */
@@ -102,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;
@@ -192,11 +197,17 @@ class PlayerSAO : public ServerActiveObject
        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
@@ -205,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);
@@ -303,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
@@ -314,12 +325,10 @@ 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_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;