Fix core.get_player_by_name() returning unusable ObjectRef

[minetest.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 9af6e5cac595f9da957e9c41767a87e84877f30f..de7f427e91a956fb9219bb1e373ed4ce1618e86f 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -32,6 +32,12 @@ 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;
+       bool is_multiplier;
+};
+
 struct PlayerControl
 {
        PlayerControl() = default;
@@ -87,7 +93,7 @@ struct PlayerControl
 struct PlayerSettings
 {
        bool free_move = false;
-       bool pitch_fly = false;
+       bool pitch_move = false;
        bool fast_move = false;
        bool continuous_forward = false;
        bool always_fly_fast = false;
@@ -96,7 +102,7 @@ struct PlayerSettings
        bool autojump = false;
 
        const std::string setting_names[8] = {
-               "free_move", "pitch_fly", "fast_move", "continuous_forward", "always_fly_fast",
+               "free_move", "pitch_move", "fast_move", "continuous_forward", "always_fly_fast",
                "aux1_descends", "noclip", "autojump"
        };
        void readGlobalSettings();
@@ -173,6 +179,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_spec = spec;
+       }
+
+       const PlayerFovSpec &getFov() const
+       {
+               return m_fov_spec;
+       }
+
        u32 keyPressed = 0;
 
        HudElement* getHud(u32 id);
@@ -182,9 +203,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_spec = { 0.0f, false };
 
        std::vector<HudElement *> hud;
 private: