summaryrefslogtreecommitdiff
path: root/src/client.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-17 10:41:59 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-17 10:41:59 +0300
commit38b46ebb02bbe307765aa9a456b587eafd3dfd7e (patch)
treed096b453db8708d8239a4255a9d626eb8bb0f681 /src/client.cpp
parent9cdbed6c562f95e24e02f49630386f8b18884a02 (diff)
downloadmanaverse-38b46ebb02bbe307765aa9a456b587eafd3dfd7e.tar.gz
manaverse-38b46ebb02bbe307765aa9a456b587eafd3dfd7e.tar.bz2
manaverse-38b46ebb02bbe307765aa9a456b587eafd3dfd7e.tar.xz
manaverse-38b46ebb02bbe307765aa9a456b587eafd3dfd7e.zip
Remove getter for generalHandler.
Diffstat (limited to 'src/client.cpp')
-rw-r--r--src/client.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 3758056a6..88c9766e0 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -765,8 +765,8 @@ int Client::gameExec()
continue;
BLOCK_START("Client::gameExec 3")
- if (Net::getGeneralHandler())
- Net::getGeneralHandler()->flushNetwork();
+ if (generalHandler)
+ generalHandler->flushNetwork();
BLOCK_END("Client::gameExec 3")
BLOCK_START("Client::gameExec 4")
@@ -1369,8 +1369,8 @@ int Client::gameExec()
mCurrentDialog = nullptr;
logger->log1("State: GAME");
- if (Net::getGeneralHandler())
- Net::getGeneralHandler()->reloadPartially();
+ if (generalHandler)
+ generalHandler->reloadPartially();
mGame = new Game;
BLOCK_END("Client::gameExec STATE_GAME")
break;
@@ -1573,8 +1573,8 @@ int Client::gameExec()
case STATE_FORCE_QUIT:
BLOCK_START("Client::gameExec STATE_FORCE_QUIT")
logger->log1("State: FORCE QUIT");
- if (Net::getGeneralHandler())
- Net::getGeneralHandler()->unload();
+ if (generalHandler)
+ generalHandler->unload();
mState = STATE_EXIT;
BLOCK_END("Client::gameExec STATE_FORCE_QUIT")
break;