diff options
Diffstat (limited to 'src/player.h')
| -rw-r--r-- | src/player.h | 49 |
1 files changed, 2 insertions, 47 deletions
diff --git a/src/player.h b/src/player.h index 4b776a03f..a7a2433ce 100644 --- a/src/player.h +++ b/src/player.h @@ -25,39 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "collision.h" #define PLAYERNAME_SIZE 20 -#define PASSWORD_SIZE 28 // Maximum password length. Allows for - // base64-encoded SHA-1. - -#define PLAYERNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.," - -// Player privileges. These form a bitmask stored in the privs field -// of the player, and define things they're allowed to do. See also -// the static methods Player::privsToString and stringToPrivs that -// convert these to human-readable form. -const u64 PRIV_BUILD = 1; // Can build - i.e. modify the world -const u64 PRIV_TELEPORT = 2; // Can teleport -const u64 PRIV_SETTIME = 4; // Can set the time -const u64 PRIV_PRIVS = 8; // Can grant and revoke privileges -const u64 PRIV_SERVER = 16; // Can manage the server (e.g. shutodwn - // ,settings) -const u64 PRIV_SHOUT = 32; // Can broadcast chat messages to all - // players - -// Default privileges - these can be overriden for new players using the -// config option "default_privs" - however, this value still applies for -// players that existed before the privileges system was added. -const u64 PRIV_DEFAULT = PRIV_BUILD|PRIV_SHOUT; -const u64 PRIV_ALL = 0x7FFFFFFFFFFFFFFFULL; -const u64 PRIV_INVALID = 0x8000000000000000ULL; - -// Convert a privileges value into a human-readable string, -// with each component separated by a comma. -std::wstring privsToString(u64 privs); - -// Converts a comma-seperated list of privilege values into a -// privileges value. The reverse of privsToString(). Returns -// PRIV_INVALID if there is anything wrong with the input. -u64 stringToPrivs(std::wstring str); + +#define PLAYERNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_" class Map; @@ -128,16 +97,6 @@ public: return m_name; } - virtual void updatePassword(const char *password) - { - snprintf(m_password, PASSWORD_SIZE, "%s", password); - } - - const char * getPassword() - { - return m_password; - } - virtual bool isLocal() const = 0; virtual void updateLight(u8 light_at_pos) {}; @@ -167,14 +126,10 @@ public: u16 hp; - // Player's privileges - a bitmaps of PRIV_xxxx. - u64 privs; - u16 peer_id; protected: char m_name[PLAYERNAME_SIZE]; - char m_password[PASSWORD_SIZE]; f32 m_pitch; f32 m_yaw; v3f m_speed; |