remove_detached_inventory: Fix segfault during mod load

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

diff --git a/src/player.h b/src/player.h
index e343f55a5432fa698b127d6ba00b9f18523c1646..b0c3b257407abe5a7306c56dd8249d1b330d2241 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -84,6 +84,24 @@ struct PlayerControl
        float forw_move_joystick_axis = 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;
+       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",
+               "aux1_descends", "noclip", "autojump"
+       };
+       void readGlobalSettings();
+};
+
 class Map;
 struct CollisionInfo;
 struct HudElement;
@@ -148,9 +166,17 @@ public:
        float local_animation_speed;
 
        std::string inventory_formspec;
+       std::string formspec_prepend;
 
        PlayerControl control;
        const PlayerControl& getPlayerControl() { return control; }
+       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; }
 
        u32 keyPressed = 0;
 
@@ -164,6 +190,7 @@ public:
 protected:
        char m_name[PLAYERNAME_SIZE];
        v3f m_speed;
+       u16 m_wield_index = 0;
 
        std::vector<HudElement *> hud;
 private:
@@ -171,4 +198,5 @@ private:
        // hud for example can be modified by EmergeThread
        // and ServerThread
        std::mutex m_mutex;
+       PlayerSettings m_player_settings;
 };