Fix build error on Ubuntu 16.04 (again)

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

diff --git a/src/player.h b/src/player.h
index 66cd0f5cfa8f494063126d1b684dd4627e8e5e08..3bc7762fa834d5487fc30925129b6ca2725edcc8 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -32,6 +32,18 @@ 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;
@@ -87,15 +99,17 @@ struct PlayerControl
 struct PlayerSettings
 {
        bool free_move = false;
+       bool pitch_move = false;
        bool fast_move = 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[6] = {
-               "free_move", "fast_move", "continuous_forward", "always_fly_fast",
-               "aux1_descends", "noclip"
+       const std::string setting_names[8] = {
+               "free_move", "pitch_move", "fast_move", "continuous_forward", "always_fly_fast",
+               "aux1_descends", "noclip", "autojump"
        };
        void readGlobalSettings();
 };
@@ -171,6 +185,21 @@ public:
        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);
@@ -180,9 +209,12 @@ public:
 
        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: