From 757e2a56e546d7e266660e9670a14d8043924cb2 Mon Sep 17 00:00:00 2001 From: Philipp Sehmisch Date: Mon, 18 Jan 2010 16:40:22 +0100 Subject: Reverted the accountserver-affecting changes of commits a9a87aea and dfc6875e - doesn't work out the way I planned. --- src/account-server/accounthandler.cpp | 5 ++--- src/account-server/storage.cpp | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src/account-server') diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp index dbd74b07..83a4a8a0 100644 --- a/src/account-server/accounthandler.cpp +++ b/src/account-server/accounthandler.cpp @@ -29,7 +29,6 @@ #include "account-server/serverhandler.hpp" #include "chat-server/chathandler.hpp" #include "common/configuration.hpp" -#include "common/permissionmanager.hpp" #include "common/transaction.hpp" #include "net/connectionhandler.hpp" #include "net/messagein.hpp" @@ -235,7 +234,7 @@ void AccountHandler::handleLoginMessage(AccountClient &client, MessageIn &msg) return; } - if (PermissionManager::checkPermission(acc->getLevel(), "!play") != PermissionManager::PMR_ALLOWED) + if (acc->getLevel() == AL_BANNED) { reply.writeByte(LOGIN_BANNED); client.send(reply); @@ -390,7 +389,7 @@ void AccountHandler::handleRegisterMessage(AccountClient &client, MessageIn &msg // we ask for it again when we need it and verify it // through comparing it with the hash acc->setEmail(sha256(email)); - acc->setLevel(0x01); + acc->setLevel(AL_PLAYER); // set the date and time of the account registration, and the last login time_t regdate; diff --git a/src/account-server/storage.cpp b/src/account-server/storage.cpp index 7bc020c8..c547977f 100644 --- a/src/account-server/storage.cpp +++ b/src/account-server/storage.cpp @@ -36,9 +36,6 @@ #include "utils/xml.hpp" #include "utils/sha256.h" -#define AL_BANNED 0x00 // temporary workaround until permission manager support is added -#define AL_PLAYER 0x01 // temporary workaround until permission manager support is added - // TODO: make data/items.xml a constant or read it from config file static const char *DEFAULT_ITEM_FILE = "data/items.xml"; -- cgit v1.2.3-70-g09d2