Optimize updateFastFaceRow processing by removing some TileSpec copy (#5678)

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

diff --git a/src/content_sao.h b/src/content_sao.h
index 4abe932501179015718837ad9f03efff42befa7a..e0879557941507e77de18c859872dcb0032c410e 100644 (file)
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -121,6 +121,7 @@ public:
        v3f getAcceleration();
 
        void setTextureMod(const std::string &mod);
+       std::string getTextureMod() const;
        void setSprite(v2s16 p, int num_frames, float framelength,
                        bool select_horiz_by_yawpitch);
        std::string getName();
@@ -142,6 +143,7 @@ private:
        v3f m_last_sent_velocity;
        float m_last_sent_position_timer;
        float m_last_sent_move_precision;
+       std::string m_current_texture_modifier;
 };
 
 /*
@@ -155,18 +157,26 @@ class LagPool
 public:
        LagPool(): m_pool(15), m_max(15)
        {}
+
        void setMax(float new_max)
        {
                m_max = new_max;
                if(m_pool > new_max)
                        m_pool = new_max;
        }
+
        void add(float dtime)
        {
                m_pool -= dtime;
                if(m_pool < 0)
                        m_pool = 0;
        }
+
+       void empty()
+       {
+               m_pool = m_max;
+       }
+
        bool grab(float dtime)
        {
                if(dtime <= 0)
@@ -178,12 +188,13 @@ public:
        }
 };
 
+typedef UNORDERED_MAP<std::string, std::string> PlayerAttributes;
 class RemotePlayer;
 
 class PlayerSAO : public UnitSAO
 {
 public:
-       PlayerSAO(ServerEnvironment *env_, u16 peer_id_, bool is_singleplayer);
+       PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id_, bool is_singleplayer);
        ~PlayerSAO();
        ActiveObjectType getType() const
        { return ACTIVEOBJECT_TYPE_PLAYER; }
@@ -243,10 +254,44 @@ public:
        InventoryLocation getInventoryLocation() const;
        std::string getWieldList() const;
        ItemStack getWieldedItem() const;
+       ItemStack getWieldedItemOrHand() const;
        bool setWieldedItem(const ItemStack &item);
        int getWieldIndex() const;
        void setWieldIndex(int i);
 
+       /*
+               Modding interface
+       */
+       inline void setExtendedAttribute(const std::string &attr, const std::string &value)
+       {
+               m_extra_attributes[attr] = value;
+               m_extended_attributes_modified = true;
+       }
+
+       inline bool getExtendedAttribute(const std::string &attr, std::string *value)
+       {
+               if (m_extra_attributes.find(attr) == m_extra_attributes.end())
+                       return false;
+
+               *value = m_extra_attributes[attr];
+               return true;
+       }
+
+       inline const PlayerAttributes &getExtendedAttributes()
+       {
+               return m_extra_attributes;
+       }
+
+       inline bool extendedAttributesModified() const
+       {
+               return m_extended_attributes_modified;
+       }
+
+       inline void setExtendedAttributeModified(bool v)
+       {
+               m_extended_attributes_modified = v;
+       }
+
        /*
                PlayerSAO-specific
        */
@@ -304,7 +349,7 @@ public:
        bool getCollisionBox(aabb3f *toset) const;
        bool collideWithObjects() const { return true; }
 
-       void initialize(RemotePlayer *player, const std::set<std::string> &privs);
+       void finalize(RemotePlayer *player, const std::set<std::string> &privs);
 
        v3f getEyePosition() const { return m_base_position + getEyeOffset(); }
        v3f getEyeOffset() const;
@@ -322,6 +367,7 @@ private:
        LagPool m_dig_pool;
        LagPool m_move_pool;
        v3f m_last_good_position;
+       float m_time_from_last_teleport;
        float m_time_from_last_punch;
        v3s16 m_nocheat_dig_pos;
        float m_nocheat_dig_time;
@@ -329,6 +375,7 @@ private:
        // Timers
        IntervalLimiter m_breathing_interval;
        IntervalLimiter m_drowning_interval;
+       IntervalLimiter m_node_hurt_interval;
 
        int m_wield_index;
        bool m_position_not_sent;
@@ -341,12 +388,16 @@ private:
        f32 m_pitch;
        f32 m_fov;
        s16 m_wanted_range;
+
+       PlayerAttributes m_extra_attributes;
+       bool m_extended_attributes_modified;
 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_new_move;
        bool m_physics_override_sent;
 };