Merge pull request #35 from arydevy/patch-1

[dragonfireclient.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 3bc7762fa834d5487fc30925129b6ca2725edcc8..9a4a41fa6b52f8a9dbf2176b89167903193259fb 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -57,8 +57,8 @@ struct PlayerControl
                bool a_aux1,
                bool a_sneak,
                bool a_zoom,
-               bool a_LMB,
-               bool a_RMB,
+               bool a_dig,
+               bool a_place,
                float a_pitch,
                float a_yaw,
                float a_sidew_move_joystick_axis,
@@ -73,8 +73,8 @@ struct PlayerControl
                aux1 = a_aux1;
                sneak = a_sneak;
                zoom = a_zoom;
-               LMB = a_LMB;
-               RMB = a_RMB;
+               dig = a_dig;
+               place = a_place;
                pitch = a_pitch;
                yaw = a_yaw;
                sidew_move_joystick_axis = a_sidew_move_joystick_axis;
@@ -88,8 +88,8 @@ struct PlayerControl
        bool aux1 = false;
        bool sneak = false;
        bool zoom = false;
-       bool LMB = false;
-       bool RMB = false;
+       bool dig = false;
+       bool place = false;
        float pitch = 0.0f;
        float yaw = 0.0f;
        float sidew_move_joystick_axis = 0.0f;
@@ -101,14 +101,15 @@ struct PlayerSettings
        bool free_move = false;
        bool pitch_move = false;
        bool fast_move = false;
+       bool freecam = false;
        bool continuous_forward = false;
        bool always_fly_fast = false;
        bool aux1_descends = false;
        bool noclip = false;
        bool autojump = false;
 
-       const std::string setting_names[8] = {
-               "free_move", "pitch_move", "fast_move", "continuous_forward", "always_fly_fast",
+       const std::string setting_names[9] = {
+               "free_move", "pitch_move", "fast_move", "freecam", "continuous_forward", "always_fly_fast",
                "aux1_descends", "noclip", "autojump"
        };
        void readGlobalSettings();