Add support for limiting rotation of automatic face movement dir entitys

[dragonfireclient.git] / src / content_sao.h

diff --git a/src/content_sao.h b/src/content_sao.h
index f61566665310061e5b316536a52300988ff89e9a..44d40d332733d307266280166dac52f8110572bf 100644 (file)
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -65,6 +65,9 @@ class LuaEntitySAO : public ServerActiveObject
        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);
+       void addAttachmentChild(int child_id);
+       void removeAttachmentChild(int child_id);
+       std::set<int> getAttachmentChildIds();
        ObjectProperties* accessObjectProperties();
        void notifyObjectPropertiesModified();
        /* LuaEntitySAO-specific */
@@ -88,13 +91,13 @@ class LuaEntitySAO : public ServerActiveObject
        std::string m_init_state;
        bool m_registered;
        struct ObjectProperties m_prop;
-       
+
        s16 m_hp;
        v3f m_velocity;
        v3f m_acceleration;
        float m_yaw;
        ItemGroupList m_armor_groups;
-       
+
        bool m_properties_sent;
        float m_last_sent_yaw;
        v3f m_last_sent_position;
@@ -113,6 +116,7 @@ class LuaEntitySAO : public ServerActiveObject
        bool m_bone_position_sent;
 
        int m_attachment_parent_id;
+       std::set<int> m_attachment_child_ids;
        std::string m_attachment_bone;
        v3f m_attachment_position;
        v3f m_attachment_rotation;
@@ -204,10 +208,11 @@ class PlayerSAO : public ServerActiveObject
        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);
+       void addAttachmentChild(int child_id);
+       void removeAttachmentChild(int child_id);
+       std::set<int> getAttachmentChildIds();
        ObjectProperties* accessObjectProperties();
        void notifyObjectPropertiesModified();
-       void setNametagColor(video::SColor color);
-       video::SColor getNametagColor();
 
        /*
                Inventory interface
@@ -285,7 +290,7 @@ class PlayerSAO : public ServerActiveObject
 
 private:
        std::string getPropertyPacket();
-       
+
        Player *m_player;
        u16 m_peer_id;
        Inventory *m_inventory;
@@ -320,13 +325,12 @@ class PlayerSAO : public ServerActiveObject
        bool m_bone_position_sent;
 
        int m_attachment_parent_id;
+       std::set<int> m_attachment_child_ids;
        std::string m_attachment_bone;
        v3f m_attachment_position;
        v3f m_attachment_rotation;
        bool m_attachment_sent;
 
-       video::SColor m_nametag_color;
-       bool m_nametag_sent;
 
 public:
        float m_physics_override_speed;
@@ -338,4 +342,3 @@ class PlayerSAO : public ServerActiveObject
 };
 
 #endif
-