diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-30 11:07:08 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-30 16:37:02 +0300 |
commit | e46cf607a4da55fc77b6b2ea7fca53d69ec6e56b (patch) | |
tree | e829744b50cab41c5f72c2a99a1fef971c2b9077 /src/net/tmwa/charserverhandler.cpp | |
parent | 3bea3e2804fbec4c7697d29af46c6330b1ca9b92 (diff) | |
download | manaplus-e46cf607a4da55fc77b6b2ea7fca53d69ec6e56b.tar.gz manaplus-e46cf607a4da55fc77b6b2ea7fca53d69ec6e56b.tar.bz2 manaplus-e46cf607a4da55fc77b6b2ea7fca53d69ec6e56b.tar.xz manaplus-e46cf607a4da55fc77b6b2ea7fca53d69ec6e56b.zip |
Remove additional parameters from processCharMapServer function.
Diffstat (limited to 'src/net/tmwa/charserverhandler.cpp')
-rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index b8bdf4842..ae64dbf60 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -113,7 +113,7 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg) break; case SMSG_CHANGE_MAP_SERVER: - processChangeMapServer(msg, mNetwork, mapServer); + processChangeMapServer(msg); break; default: @@ -387,4 +387,31 @@ void CharServerHandler::processCharMapInfo(Net::MessageIn &restrict msg) BLOCK_END("CharServerHandler::processCharMapInfo") } +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()); + if (!gh || !network) + { + BLOCK_END("CharServerHandler::processChangeMapServer") + return; + } + gh->setMap(msg.readString(16)); + const int x = msg.readInt16(); + const int y = msg.readInt16(); + server.hostname = ipToString(msg.readInt32()); + server.port = msg.readInt16(); + + network->disconnect(); + client->setState(STATE_CHANGE_MAP); + if (localPlayer) + { + localPlayer->setTileCoords(x, y); + localPlayer->setMap(nullptr); + } + BLOCK_END("CharServerHandler::processChangeMapServer") +} + } // namespace TmwAthena |