summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-17 11:03:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-17 11:03:22 +0300
commitdfaae6f6e804e7779ade870a211a1a14d3a5d9aa (patch)
treea7652f4e548e166b39a8203e27c890c02c62d5ca /src/net/eathena
parentfd050698f74b5dc7a9867bc93ba6b7c65ef2462f (diff)
downloadplus-dfaae6f6e804e7779ade870a211a1a14d3a5d9aa.tar.gz
plus-dfaae6f6e804e7779ade870a211a1a14d3a5d9aa.tar.bz2
plus-dfaae6f6e804e7779ade870a211a1a14d3a5d9aa.tar.xz
plus-dfaae6f6e804e7779ade870a211a1a14d3a5d9aa.zip
Remove getter for loginHandler.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/charserverhandler.cpp7
-rw-r--r--src/net/eathena/gamehandler.cpp3
2 files changed, 4 insertions, 6 deletions
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 189acb05d..bf1f18004 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -142,7 +142,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
return;
const Token &token =
- static_cast<LoginHandler*>(Net::getLoginHandler())->getToken();
+ static_cast<LoginHandler*>(loginHandler)->getToken();
LocalPlayer *const tempPlayer = new LocalPlayer(
msg.readInt32("player id"), 0);
@@ -274,7 +274,7 @@ void CharServerHandler::switchCharacter() const
void CharServerHandler::connect()
{
const Token &token =
- static_cast<LoginHandler*>(Net::getLoginHandler())->getToken();
+ static_cast<LoginHandler*>(loginHandler)->getToken();
if (!mNetwork)
return;
@@ -301,8 +301,7 @@ void CharServerHandler::setCharCreateDialog(CharCreateDialog *const window)
StringVect attributes;
- const Token &token =
- static_cast<LoginHandler*>(Net::getLoginHandler())->getToken();
+ const Token &token = static_cast<LoginHandler*>(loginHandler)->getToken();
mCharCreateDialog->setAttributes(attributes, 0, 0, 0);
mCharCreateDialog->setFixedGender(true, token.sex);
diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp
index 07e4dd7c6..381131fbc 100644
--- a/src/net/eathena/gamehandler.cpp
+++ b/src/net/eathena/gamehandler.cpp
@@ -107,8 +107,7 @@ void GameHandler::connect()
mNetwork->connect(mapServer);
- const Token &token =
- static_cast<LoginHandler*>(Net::getLoginHandler())->getToken();
+ const Token &token = static_cast<LoginHandler*>(loginHandler)->getToken();
if (client->getState() == STATE_CONNECT_GAME)