Send Inventory packet on event, don't check it at each AsyncRunStep.

[dragonfireclient.git] / src / content_sao.h

diff --git a/src/content_sao.h b/src/content_sao.h
index 140211cf6f8ba3f3d3f5d87ce4801d17e83d81bb..a9302915490bf27946ceb277ca6048dd04ae48c0 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,
@@ -122,15 +118,45 @@ 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:
        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();
 
@@ -141,7 +167,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();
@@ -163,6 +188,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);
@@ -179,7 +205,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);
@@ -228,6 +253,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
 
@@ -247,10 +278,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;
@@ -283,14 +316,12 @@ class PlayerSAO : public ServerActiveObject
 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;
 
        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;
 };