Merge pull request #1825 from Zeno-/control_key_cache

[dragonfireclient.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index aa38996a54e08e15f24adddd623655e104489a6c..435875233b45250368eae095f84292de4c56a0a2 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -226,9 +226,16 @@ class Player
        void serialize(std::ostream &os);
        void deSerialize(std::istream &is, std::string playername);
 
-       bool checkModified()
+       bool checkModified() const
        {
-               return m_dirty;
+               return m_dirty || inventory.checkModified();
+       }
+
+       void setModified(const bool x)
+       {
+               m_dirty = x;
+               if (x == false)
+                       inventory.setModified(x);
        }
 
        bool touching_ground;
@@ -242,8 +249,6 @@ class Player
        bool swimming_vertical;
        bool camera_barely_in_ceiling;
        
-       u8 light;
-
        Inventory inventory;
 
        f32 movement_acceleration_default;