From dfaae6f6e804e7779ade870a211a1a14d3a5d9aa Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 17 Sep 2014 11:03:22 +0300 Subject: Remove getter for loginHandler. --- src/net/tmwa/charserverhandler.cpp | 7 +++---- src/net/tmwa/gamehandler.cpp | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/net/tmwa') diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 969353cc4..d386206aa 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -138,7 +138,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg, return; const Token &token = - static_cast(Net::getLoginHandler())->getToken(); + static_cast(loginHandler)->getToken(); LocalPlayer *const tempPlayer = new LocalPlayer( msg.readInt32("account id"), 0); @@ -310,7 +310,7 @@ void CharServerHandler::switchCharacter() const void CharServerHandler::connect() { const Token &token = - static_cast(Net::getLoginHandler())->getToken(); + static_cast(loginHandler)->getToken(); if (!mNetwork) return; @@ -359,8 +359,7 @@ void CharServerHandler::setCharCreateDialog(CharCreateDialog *const window) // TRANSLATORS: playe stat attributes.push_back(_("Luck:")); - const Token &token = - static_cast(Net::getLoginHandler())->getToken(); + const Token &token = static_cast(loginHandler)->getToken(); int minStat = CharDB::getMinStat(); if (!minStat) diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index f0c3c0d5d..8815803c6 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -103,8 +103,7 @@ void GameHandler::connect() BLOCK_START("GameHandler::connect") mNetwork->connect(mapServer); - const Token &token = static_cast( - Net::getLoginHandler())->getToken(); + const Token &token = static_cast(loginHandler)->getToken(); if (client->getState() == STATE_CONNECT_GAME) { -- cgit v1.2.3-70-g09d2