From 38b46ebb02bbe307765aa9a456b587eafd3dfd7e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 17 Sep 2014 10:41:59 +0300 Subject: Remove getter for generalHandler. --- src/client.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/client.cpp') 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; -- cgit v1.2.3-60-g2f50