From c2a7004213529c403faeb6fdcc374699aa2f53b5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
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 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/net/ea')

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
-- 
cgit v1.2.3-70-g09d2