Mgvalleys: use standard caves

[minetest.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index c84cc1c9290b3db5fe3e6426545c5e12e02a20b6..48b0a499938b0206e2682b7527f78d275ec4a5f6 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -23,12 +23,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_bloated.h"
 #include "inventory.h"
 #include "constants.h" // BS
-#include "jthread/jmutex.h"
+#include "threading/mutex.h"
 #include <list>
 
 #define PLAYERNAME_SIZE 20
 
 #define PLAYERNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
+#define PLAYERNAME_ALLOWED_CHARS_USER_EXPL "'a' to 'z', 'A' to 'Z', '0' to '9', '-', '_'"
 
 struct PlayerControl
 {
@@ -362,6 +363,7 @@ class Player
        float hurt_tilt_timer;
        float hurt_tilt_strength;
 
+       u16 protocol_version;
        u16 peer_id;
 
        std::string inventory_formspec;
@@ -412,7 +414,7 @@ class Player
        // Protect some critical areas
        // hud for example can be modified by EmergeThread
        // and ServerThread
-       JMutex m_mutex;
+       Mutex m_mutex;
 };
 
 
@@ -422,10 +424,7 @@ class Player
 class RemotePlayer : public Player
 {
 public:
-       RemotePlayer(IGameDef *gamedef, const char *name):
-               Player(gamedef, name),
-               m_sao(NULL)
-       {}
+       RemotePlayer(IGameDef *gamedef, const char *name);
        virtual ~RemotePlayer() {}
 
        void save(std::string savedir);