From 40730c4fa73d403cf7284a76d9b26f7ec662afa4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 2 Sep 2015 03:12:14 +0300 Subject: Remove mNetwork field from MessageHandlers --- src/net/tmwa/gamehandler.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/net/tmwa/gamehandler.cpp') diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index a3af6118b..00537bf83 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -101,11 +101,11 @@ void GameHandler::mapLoadedEvent() const void GameHandler::connect() { - if (!mNetwork) + if (!Network::mInstance) return; BLOCK_START("GameHandler::connect") - mNetwork->connect(mapServer); + Network::mInstance->connect(mapServer); const Token &token = static_cast(loginHandler)->getToken(); if (client->getState() == STATE_CONNECT_GAME) @@ -138,22 +138,22 @@ void GameHandler::connect() } */ // We get 4 useless bytes before the real answer comes in (what are these?) - mNetwork->skip(4); + Network::mInstance->skip(4); BLOCK_END("GameHandler::connect") } bool GameHandler::isConnected() const { - if (!mNetwork) + if (!Network::mInstance) return false; - return mNetwork->isConnected(); + return Network::mInstance->isConnected(); } void GameHandler::disconnect() { BLOCK_START("GameHandler::disconnect") - if (mNetwork) - mNetwork->disconnect(); + if (Network::mInstance) + Network::mInstance->disconnect(); BLOCK_END("GameHandler::disconnect") } -- cgit v1.2.3-70-g09d2