Advanced settings noiseparams: Remove '}' left in .conf

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

diff --git a/src/player.h b/src/player.h
index 0b2cbbfb27eab0e369ce8fa6c91fab082702830e..05b6fcbb53e21fba10143e716311fa14d4c08380 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -17,12 +17,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef PLAYER_HEADER
-#define PLAYER_HEADER
+#pragma once
 
 #include "irrlichttypes_bloated.h"
 #include "inventory.h"
 #include "constants.h"
+#include "network/networkprotocol.h"
 #include "util/basic_macros.h"
 #include <list>
 #include <mutex>
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct PlayerControl
 {
-       PlayerControl() {}
+       PlayerControl() = default;
 
        PlayerControl(
                bool a_up,
@@ -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;
@@ -104,12 +122,12 @@ public:
                        std::vector<CollisionInfo> *collision_info)
        {}
 
-       v3f getSpeed()
+       const v3f &getSpeed() const
        {
                return m_speed;
        }
 
-       void setSpeed(v3f speed)
+       void setSpeed(const v3f &speed)
        {
                m_speed = speed;
        }
@@ -147,12 +165,13 @@ public:
        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;
 
@@ -173,7 +192,5 @@ private:
        // hud for example can be modified by EmergeThread
        // and ServerThread
        std::mutex m_mutex;
+       PlayerSettings m_player_settings;
 };
-
-#endif
-