Use player:set_hotbar_image() instead of hardcoded hotbar.png

[minetest.git] / src / content_sao.h

diff --git a/src/content_sao.h b/src/content_sao.h
index bfce83d02fd1d9a3c8c9da8e2af79aecf23bbc46..6b97cb1488ddd6ad92688af7d9cd3a672ea0c490 100644 (file)
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -79,6 +79,7 @@ class LuaEntitySAO : public ServerActiveObject
                        bool select_horiz_by_yawpitch);
        std::string getName();
        bool getCollisionBox(aabb3f *toset);
+       bool collideWithObjects();
 private:
        std::string getPropertyPacket();
        void sendPosition(bool do_interpolate, bool is_movement_end);
@@ -121,6 +122,36 @@ class LuaEntitySAO : public ServerActiveObject
        PlayerSAO needs some internals exposed.
 */
 
+class LagPool
+{
+       float m_pool;
+       float m_max;
+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;
+       }
+       bool grab(float dtime)
+       {
+               if(dtime <= 0)
+                       return true;
+               if(m_pool + dtime > m_max)
+                       return false;
+               m_pool += dtime;
+               return true;
+       }
+};
+
 class PlayerSAO : public ServerActiveObject
 {
 public:
@@ -162,6 +193,7 @@ 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);
@@ -227,6 +259,12 @@ class PlayerSAO : public ServerActiveObject
        {
                m_nocheat_dig_pos = v3s16(32767, 32767, 32767);
        }
+       LagPool& getDigPool()
+       {
+               return m_dig_pool;
+       }
+       // Returns true if cheated
+       bool checkMovementCheat();
 
        // Other
 
@@ -238,6 +276,7 @@ class PlayerSAO : public ServerActiveObject
        }
 
        bool getCollisionBox(aabb3f *toset);
+       bool collideWithObjects();
 
 private:
        std::string getPropertyPacket();
@@ -245,10 +284,12 @@ class PlayerSAO : public ServerActiveObject
        Player *m_player;
        u16 m_peer_id;
        Inventory *m_inventory;
+       s16 m_damage;
 
        // Cheat prevention
+       LagPool m_dig_pool;
+       LagPool m_move_pool;
        v3f m_last_good_position;
-       float m_last_good_position_age;
        float m_time_from_last_punch;
        v3s16 m_nocheat_dig_pos;
        float m_nocheat_dig_time;