Correct ServerActiveObject's virtual getArmorGroups() to be const.

[dragonfireclient.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 27da73c1604818d1328b28b5f55f51f83b9cdfd1..05b6fcbb53e21fba10143e716311fa14d4c08380 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_bloated.h"
 #include "inventory.h"
 #include "constants.h"
+#include "network/networkprotocol.h"
 #include "util/basic_macros.h"
 #include <list>
 #include <mutex>
@@ -83,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;
@@ -146,12 +165,13 @@ class Player
        v2s32 local_animations[4];
        float local_animation_speed;
 
-       u16 peer_id = PEER_ID_INEXISTENT;
-
        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);
 
        u32 keyPressed = 0;
 
@@ -172,4 +192,5 @@ class Player
        // hud for example can be modified by EmergeThread
        // and ServerThread
        std::mutex m_mutex;
+       PlayerSettings m_player_settings;
 };