Fixed two typo's in commit 615fd498bc

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

diff --git a/src/player.h b/src/player.h
index 4ffac7ef072e15831ccd70552c5ab9532daaaa2b..67b02c3445d15b7cac634ce8b6917063f3bfce78 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -20,13 +20,69 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef PLAYER_HEADER
 #define PLAYER_HEADER
 
-#include "irrlichttypes.h"
+#include "irrlichttypes_bloated.h"
 #include "inventory.h"
+#include "constants.h" // BS
 
 #define PLAYERNAME_SIZE 20
 
 #define PLAYERNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
 
+struct PlayerControl
+{
+       PlayerControl()
+       {
+               up = false;
+               down = false;
+               left = false;
+               right = false;
+               jump = false;
+               aux1 = false;
+               sneak = false;
+               LMB = false;
+               RMB = false;
+               pitch = 0;
+               yaw = 0;
+       }
+       PlayerControl(
+               bool a_up,
+               bool a_down,
+               bool a_left,
+               bool a_right,
+               bool a_jump,
+               bool a_aux1,
+               bool a_sneak,
+               bool a_LMB,
+               bool a_RMB,
+               float a_pitch,
+               float a_yaw
+       )
+       {
+               up = a_up;
+               down = a_down;
+               left = a_left;
+               right = a_right;
+               jump = a_jump;
+               aux1 = a_aux1;
+               sneak = a_sneak;
+               LMB = a_LMB;
+               RMB = a_RMB;
+               pitch = a_pitch;
+               yaw = a_yaw;
+       }
+       bool up;
+       bool down;
+       bool left;
+       bool right;
+       bool jump;
+       bool aux1;
+       bool sneak;
+       bool LMB;
+       bool RMB;
+       float pitch;
+       float yaw;
+};
+
 class Map;
 class IGameDef;
 struct CollisionInfo;
@@ -149,12 +205,24 @@ public:
        
        u8 light;
 
-       // In creative mode, this is the invisible backup inventory
        Inventory inventory;
 
        u16 hp;
 
+       float hurt_tilt_timer;
+       float hurt_tilt_strength;
+
        u16 peer_id;
+       
+       std::string inventory_formspec;
+       
+       PlayerControl control;
+       PlayerControl getPlayerControl()
+       {
+               return control;
+       }
+       
+       u32 keyPressed;
 
 protected:
        IGameDef *m_gamedef;
@@ -180,7 +248,7 @@ public:
        void setPlayerSAO(PlayerSAO *sao)
        { m_sao = sao; }
        void setPosition(const v3f &position);
-
+       
 private:
        PlayerSAO *m_sao;
 };