summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-17 10:31:03 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-17 10:31:03 +0300
commit9cdbed6c562f95e24e02f49630386f8b18884a02 (patch)
tree4dad8316607387c80b66cf42b2a806ffa1a3afed /src/net/eathena
parent3a7313c027407e3b35360a021c72fe78f181d81d (diff)
downloadplus-9cdbed6c562f95e24e02f49630386f8b18884a02.tar.gz
plus-9cdbed6c562f95e24e02f49630386f8b18884a02.tar.bz2
plus-9cdbed6c562f95e24e02f49630386f8b18884a02.tar.xz
plus-9cdbed6c562f95e24e02f49630386f8b18884a02.zip
Remove getter for gameHandler.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/charserverhandler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index e1d6c5373..189acb05d 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -357,7 +357,7 @@ void CharServerHandler::processCharMapInfo(Net::MessageIn &restrict msg)
ServerInfo &server = mapServer;
BLOCK_START("CharServerHandler::processCharMapInfo")
PlayerInfo::setCharId(msg.readInt32("char id"));
- GameHandler *const gh = static_cast<GameHandler*>(Net::getGameHandler());
+ GameHandler *const gh = static_cast<GameHandler*>(gameHandler);
gh->setMap(msg.readString(16, "map name"));
if (config.getBoolValue("usePersistentIP") || settings.persistentIp)
{
@@ -390,7 +390,7 @@ void CharServerHandler::processChangeMapServer(Net::MessageIn &msg)
Network *const network = mNetwork;
ServerInfo &server = mapServer;
BLOCK_START("CharServerHandler::processChangeMapServer")
- GameHandler *const gh = static_cast<GameHandler*>(Net::getGameHandler());
+ GameHandler *const gh = static_cast<GameHandler*>(gameHandler);
if (!gh || !network)
{
BLOCK_END("CharServerHandler::processChangeMapServer")