From c2a7004213529c403faeb6fdcc374699aa2f53b5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 23 Aug 2013 22:00:27 +0300 Subject: improve getState/setState in Client. --- src/net/ea/charserverhandler.cpp | 6 +++--- src/net/ea/gamehandler.cpp | 4 ++-- src/net/ea/loginhandler.cpp | 12 ++++++------ src/net/eathena/charserverhandler.cpp | 2 +- src/net/eathena/gamehandler.cpp | 2 +- src/net/eathena/generalhandler.cpp | 6 +++--- src/net/eathena/loginhandler.cpp | 8 ++++---- src/net/tmwa/charserverhandler.cpp | 2 +- src/net/tmwa/gamehandler.cpp | 2 +- src/net/tmwa/generalhandler.cpp | 6 +++--- src/net/tmwa/loginhandler.cpp | 8 ++++---- 11 files changed, 29 insertions(+), 29 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index ef47cf99e..81beac26e 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -135,7 +135,7 @@ void CharServerHandler::processCharLoginError(Net::MessageIn &msg) const errorMessage = _("Unknown char-server failure."); break; } - Client::setState(STATE_ERROR); + client->setState(STATE_ERROR); BLOCK_END("CharServerHandler::processCharLoginError") } @@ -261,7 +261,7 @@ void CharServerHandler::processCharMapInfo(Net::MessageIn &msg, if (network) network->disconnect(); - Client::setState(STATE_CONNECT_GAME); + client->setState(STATE_CONNECT_GAME); BLOCK_END("CharServerHandler::processCharMapInfo") } @@ -283,7 +283,7 @@ void CharServerHandler::processChangeMapServer(Net::MessageIn &msg, server.port = msg.readInt16(); network->disconnect(); - Client::setState(STATE_CHANGE_MAP); + client->setState(STATE_CHANGE_MAP); if (player_node) { player_node->setTileCoords(x, y); diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index faee4b2d8..df2c4ec47 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -59,7 +59,7 @@ void GameHandler::processMapLogin(Net::MessageIn &msg) const logger->log("Protocol: Player start position: (%d, %d)," " Direction: %d", x, y, direction); // Switch now or we'll have problems - Client::setState(STATE_GAME); + client->setState(STATE_GAME); if (player_node) player_node->setTileCoords(x, y); } @@ -72,7 +72,7 @@ void GameHandler::processWhoAnswer(Net::MessageIn &msg) const void GameHandler::processCharSwitchResponse(Net::MessageIn &msg) const { if (msg.readInt8()) - Client::setState(STATE_SWITCH_CHARACTER); + client->setState(STATE_SWITCH_CHARACTER); } void GameHandler::processMapQuitResponse(Net::MessageIn &msg) const diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 2632aeb3b..fbe588b1f 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -61,7 +61,7 @@ bool LoginHandler::isRegistrationEnabled() const void LoginHandler::getRegistrationDetails() const { // Not supported, so move on - Client::setState(STATE_REGISTER); + client->setState(STATE_REGISTER); } void LoginHandler::loginAccount(LoginData *const loginData) const @@ -93,7 +93,7 @@ void LoginHandler::chooseServer(const unsigned int server) const charServer->port = mWorlds[server]->port; } - Client::setState(STATE_UPDATE); + client->setState(STATE_UPDATE); } void LoginHandler::registerAccount(LoginData *const loginData) const @@ -139,7 +139,7 @@ void LoginHandler::procecessCharPasswordResponse(Net::MessageIn &msg) const // Successful pass change if (errMsg == 1) { - Client::setState(STATE_CHANGEPASSWORD_SUCCESS); + client->setState(STATE_CHANGEPASSWORD_SUCCESS); } // pass change failed else @@ -164,7 +164,7 @@ void LoginHandler::procecessCharPasswordResponse(Net::MessageIn &msg) const errorMessage = _("Unknown error."); break; } - Client::setState(STATE_ACCOUNTCHANGE_ERROR); + client->setState(STATE_ACCOUNTCHANGE_ERROR); } } @@ -222,7 +222,7 @@ void LoginHandler::processLoginData(Net::MessageIn &msg) mWorlds.push_back(world); } - Client::setState(STATE_WORLD_SELECT); + client->setState(STATE_WORLD_SELECT); } void LoginHandler::processLoginError(Net::MessageIn &msg) const @@ -291,7 +291,7 @@ void LoginHandler::processLoginError(Net::MessageIn &msg) const errorMessage = _("Unknown error."); break; } - Client::setState(STATE_ERROR); + client->setState(STATE_ERROR); } void LoginHandler::logout() const diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 1d4928bc9..8c580ce3a 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -294,7 +294,7 @@ void CharServerHandler::processCharLogin(Net::MessageIn &msg) } } - Client::setState(STATE_CHAR_SELECT); + client->setState(STATE_CHAR_SELECT); } } // namespace EAthena diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp index cdb3029bc..4b9bcb80f 100644 --- a/src/net/eathena/gamehandler.cpp +++ b/src/net/eathena/gamehandler.cpp @@ -107,7 +107,7 @@ void GameHandler::connect() static_cast(Net::getLoginHandler())->getToken(); - if (Client::getState() == STATE_CONNECT_GAME) + if (client->getState() == STATE_CONNECT_GAME) { // Change the player's ID to the account ID to match what eAthena uses if (player_node) diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 029b7fcd4..55b3b644f 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -133,7 +133,7 @@ void GeneralHandler::handleMessage(Net::MessageIn &msg) errorMessage = _("No servers available."); break; case 2: - if (Client::getState() == STATE_GAME) + if (client->getState() == STATE_GAME) { errorMessage = _("Someone else is trying to use this " "account."); @@ -153,7 +153,7 @@ void GeneralHandler::handleMessage(Net::MessageIn &msg) errorMessage = _("Unknown connection error."); break; } - Client::setState(STATE_ERROR); + client->setState(STATE_ERROR); break; } @@ -224,7 +224,7 @@ void GeneralHandler::flushNetwork() else errorMessage = _("Got disconnected from server!"); - Client::setState(STATE_ERROR); + client->setState(STATE_ERROR); } } diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp index 91900b623..1ecfc2a51 100644 --- a/src/net/eathena/loginhandler.cpp +++ b/src/net/eathena/loginhandler.cpp @@ -167,8 +167,8 @@ void LoginHandler::processServerVersion(Net::MessageIn &msg) msg.readInt32(); mRegistrationEnabled = true; serverVersion = 0; - if (Client::getState() != STATE_LOGIN) - Client::setState(STATE_LOGIN); + if (client->getState() != STATE_LOGIN) + client->setState(STATE_LOGIN); // Leave this last mVersionResponse = true; @@ -193,8 +193,8 @@ void LoginHandler::processUpdateHost2(Net::MessageIn &msg) const logger->log("Received update hosts \"%s\" from login server.", updateHost.c_str()); - if (Client::getState() == STATE_PRE_LOGIN) - Client::setState(STATE_LOGIN); + if (client->getState() == STATE_PRE_LOGIN) + client->setState(STATE_LOGIN); } } // namespace EAthena diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index c4571969e..6e58f5ee7 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -347,7 +347,7 @@ void CharServerHandler::processCharLogin(Net::MessageIn &msg) } } - Client::setState(STATE_CHAR_SELECT); + client->setState(STATE_CHAR_SELECT); BLOCK_END("CharServerHandler::processCharLogin") } diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index 62457d718..b066db36b 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -103,7 +103,7 @@ void GameHandler::connect() const Token &token = static_cast( Net::getLoginHandler())->getToken(); - if (Client::getState() == STATE_CONNECT_GAME) + if (client->getState() == STATE_CONNECT_GAME) { // Change the player's ID to the account ID to match what eAthena uses if (player_node) diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index ba8f40551..1d92e1eb8 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -145,7 +145,7 @@ void GeneralHandler::handleMessage(Net::MessageIn &msg) errorMessage = _("No servers available."); break; case 2: - if (Client::getState() == STATE_GAME) + if (client->getState() == STATE_GAME) { // TRANSLATORS: error message errorMessage = _("Someone else is trying to use this " @@ -170,7 +170,7 @@ void GeneralHandler::handleMessage(Net::MessageIn &msg) errorMessage = _("Unknown connection error."); break; } - Client::setState(STATE_ERROR); + client->setState(STATE_ERROR); break; } @@ -251,7 +251,7 @@ void GeneralHandler::flushNetwork() errorMessage = _("Got disconnected from server!"); } - Client::setState(STATE_ERROR); + client->setState(STATE_ERROR); } BLOCK_END("GeneralHandler::flushNetwork 3") } diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index 9dc9c5447..4f7a35d3b 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -208,8 +208,8 @@ void LoginHandler::processServerVersion(Net::MessageIn &msg) logger->log("Server version: %d", serverVersion); if (serverVersion < 5) { - if (Client::getState() != STATE_LOGIN) - Client::setState(STATE_LOGIN); + if (client->getState() != STATE_LOGIN) + client->setState(STATE_LOGIN); } // Leave this last @@ -235,8 +235,8 @@ void LoginHandler::processUpdateHost2(Net::MessageIn &msg) const logger->log("Received update hosts \"%s\" from login server.", updateHost.c_str()); - if (Client::getState() == STATE_PRE_LOGIN) - Client::setState(STATE_LOGIN); + if (client->getState() == STATE_PRE_LOGIN) + client->setState(STATE_LOGIN); } int LoginHandler::supportedOptionalActions() const -- cgit v1.2.3-70-g09d2