Use project name for mo files

[dragonfireclient.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 778bb54b312534b04eeb6cda872722377f061322..a7a2433ce3d52f10f461c7d349f921958d703e46 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -26,22 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define PLAYERNAME_SIZE 20
 
-#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
-                               //  (not enforced yet)
-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_DEFAULT = PRIV_BUILD;
-const u64 PRIV_ALL = 0x7FFFFFFFFFFFFFFFULL;
-const u64 PRIV_INVALID = 0x8000000000000000ULL;
+#define PLAYERNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
 
 
 class Map;
@@ -141,9 +126,6 @@ class Player
 
        u16 hp;
 
-       // Player's privileges - a bitmaps of PRIV_xxxx.
-       u64 privs;
-
        u16 peer_id;
 
 protected:
@@ -155,54 +137,6 @@ class Player
 
 public:
 
-       // Converst a prvileges value into a human-readable string,
-       // with each component separated by a comma.
-       static std::wstring privsToString(u64 privs)
-       {
-               std::wostringstream os(std::ios_base::binary);
-               if(privs & PRIV_BUILD)
-                       os<<L"build,";
-               if(privs & PRIV_TELEPORT)
-                       os<<L"teleport,";
-               if(privs & PRIV_SETTIME)
-                       os<<L"settime,";
-               if(privs & PRIV_PRIVS)
-                       os<<L"privs,";
-               if(os.tellp())
-               {
-                       // Drop the trailing comma. (Why on earth can't
-                       // you truncate a C++ stream anyway???)
-                       std::wstring tmp = os.str();
-                       return tmp.substr(0, tmp.length() -1);
-               }
-               return os.str();
-       }
-
-       // 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.
-       static u64 stringToPrivs(std::wstring str)
-       {
-               u64 privs=0;
-               std::vector<std::wstring> pr;
-               pr=str_split(str, ',');
-               for(std::vector<std::wstring>::iterator i = pr.begin();
-                       i != pr.end(); ++i)
-               {
-                       if(*i == L"build")
-                               privs |= PRIV_BUILD;
-                       else if(*i == L"teleport")
-                               privs |= PRIV_TELEPORT;
-                       else if(*i == L"settime")
-                               privs |= PRIV_SETTIME;
-                       else if(*i == L"privs")
-                               privs |= PRIV_PRIVS;
-                       else
-                               return PRIV_INVALID;
-               }
-               return privs;
-       }
-
 };
 
 /*