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/tmwa/charserverhandler.cpp | 2 +-
 src/net/tmwa/gamehandler.cpp       | 2 +-
 src/net/tmwa/generalhandler.cpp    | 6 +++---
 src/net/tmwa/loginhandler.cpp      | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/net/tmwa')

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<LoginHandler*>(
         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-60-g2f50