diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game-server/gamehandler.cpp | 12 | ||||
| -rw-r--r-- | src/game-server/gamehandler.hpp | 6 | ||||
| -rw-r--r-- | src/game-server/main-game.cpp | 3 | ||||
| -rw-r--r-- | src/protocol.h | 3 |
4 files changed, 1 insertions, 23 deletions
diff --git a/src/game-server/gamehandler.cpp b/src/game-server/gamehandler.cpp index beb68cff..f8166f6d 100644 --- a/src/game-server/gamehandler.cpp +++ b/src/game-server/gamehandler.cpp @@ -118,18 +118,6 @@ void GameHandler::completeServerChange(int id, const std::string &token, } } -void GameHandler::disconnectAll() -{ - for (NetComputers::const_iterator i = clients.begin(), - i_end = clients.end(); i != i_end; ++i) - { - //FIXME: remove character in a safe way before disconnecting. - GameClient *c = static_cast< GameClient * >(*i); - MessageOut msg(GPMSG_ACCOUNT_SERVER_LOST); - c->disconnect(msg); - } -} - void GameHandler::updateCharacter(int charid, int partyid) { for (NetComputers::const_iterator i = clients.begin(), diff --git a/src/game-server/gamehandler.hpp b/src/game-server/gamehandler.hpp index 1cc27b26..b4c8029f 100644 --- a/src/game-server/gamehandler.hpp +++ b/src/game-server/gamehandler.hpp @@ -80,12 +80,6 @@ class GameHandler: public ConnectionHandler const std::string &address, int port); /** - * Disconnect every player in case of losing the connection - * to the Account server. - */ - void disconnectAll(); - - /** * Updates the party id of the character */ void updateCharacter(int charid, int partyid); diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp index 5fb82c36..cb6ea419 100644 --- a/src/game-server/main-game.cpp +++ b/src/game-server/main-game.cpp @@ -393,8 +393,7 @@ int main(int argc, char *argv[]) // Every players have to be logged out if (!accountServerLost) { - LOG_WARN("Lost connection to the server account. So disconnect players"); - gameHandler->disconnectAll(); + LOG_WARN("The connection to the account server was lost."); accountServerLost = true; } diff --git a/src/protocol.h b/src/protocol.h index aad4a951..b812e9cf 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -77,8 +77,6 @@ enum { PAMSG_RECONNECT = 0x0065, // B*32 token APMSG_RECONNECT_RESPONSE = 0x0066, // B error - GPMSG_ACCOUNT_SERVER_LOST = 0x0067, // - - // Game GPMSG_PLAYER_MAP_CHANGE = 0x0100, // S filename, W x, W y GPMSG_PLAYER_SERVER_CHANGE = 0x0101, // B*32 token, S game address, W game port @@ -255,7 +253,6 @@ enum { ERRMSG_EMAIL_ALREADY_EXISTS, // The Email Address already exists ERRMSG_ALREADY_TAKEN, // name used was already taken ERRMSG_SERVER_FULL, // the server is overloaded - ERRMSG_SERVER_NON_RESPONDING, // The account server connection is lost ERRMSG_TIME_OUT, // data failed to arrive in due time ERRMSG_LIMIT_REACHED // limit reached }; |