Add padding[] element to formspecs (#11821)

[dragonfireclient.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 67449154616b1a6f12b13200ef0eaa01f765a0b8..3800e1a33dc683a325f19129e25b98778a1d8de8 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -32,61 +32,63 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define PLAYERNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
 #define PLAYERNAME_ALLOWED_CHARS_USER_EXPL "'a' to 'z', 'A' to 'Z', '0' to '9', '-', '_'"
 
+struct PlayerFovSpec
+{
+       f32 fov;
+
+       // Whether to multiply the client's FOV or to override it
+       bool is_multiplier;
+
+       // The time to be take to trasition to the new FOV value.
+       // Transition is instantaneous if omitted. Omitted by default.
+       f32 transition_time;
+};
+
 struct PlayerControl
 {
        PlayerControl() = default;
 
        PlayerControl(
-               bool a_up,
-               bool a_down,
-               bool a_left,
-               bool a_right,
                bool a_jump,
                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,
-               float a_forw_move_joystick_axis
+               float a_movement_speed,
+               float a_movement_direction
        )
        {
-               up = a_up;
-               down = a_down;
-               left = a_left;
-               right = a_right;
                jump = a_jump;
                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;
-               forw_move_joystick_axis = a_forw_move_joystick_axis;
+               movement_speed = a_movement_speed;
+               movement_direction = a_movement_direction;
        }
-       bool up = false;
-       bool down = false;
-       bool left = false;
-       bool right = false;
        bool jump = false;
        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;
-       float forw_move_joystick_axis = 0.0f;
+       // Note: These two are NOT available on the server
+       float movement_speed = 0.0f;
+       float movement_direction = 0.0f;
 };
 
 struct PlayerSettings
 {
        bool free_move = false;
+       bool pitch_move = false;
        bool fast_move = false;
        bool continuous_forward = false;
        bool always_fly_fast = false;
@@ -94,8 +96,8 @@ struct PlayerSettings
        bool noclip = false;
        bool autojump = false;
 
-       const std::string setting_names[7] = {
-               "free_move", "fast_move", "continuous_forward", "always_fly_fast",
+       const std::string setting_names[8] = {
+               "free_move", "pitch_move", "fast_move", "continuous_forward", "always_fly_fast",
                "aux1_descends", "noclip", "autojump"
        };
        void readGlobalSettings();
@@ -172,6 +174,21 @@ class Player
        PlayerSettings &getPlayerSettings() { return m_player_settings; }
        static void settingsChangedCallback(const std::string &name, void *data);
 
+       // Returns non-empty `selected` ItemStack. `hand` is a fallback, if specified
+       ItemStack &getWieldedItem(ItemStack *selected, ItemStack *hand) const;
+       void setWieldIndex(u16 index);
+       u16 getWieldIndex() const { return m_wield_index; }
+
+       void setFov(const PlayerFovSpec &spec)
+       {
+               m_fov_override_spec = spec;
+       }
+
+       const PlayerFovSpec &getFov() const
+       {
+               return m_fov_override_spec;
+       }
+
        u32 keyPressed = 0;
 
        HudElement* getHud(u32 id);
@@ -181,9 +198,12 @@ class Player
 
        u32 hud_flags;
        s32 hud_hotbar_itemcount;
+
 protected:
        char m_name[PLAYERNAME_SIZE];
        v3f m_speed;
+       u16 m_wield_index = 0;
+       PlayerFovSpec m_fov_override_spec = { 0.0f, false, 0.0f };
 
        std::vector<HudElement *> hud;
 private: