From e46cf607a4da55fc77b6b2ea7fca53d69ec6e56b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 Aug 2014 11:07:08 +0300 Subject: Remove additional parameters from processCharMapServer function. --- src/net/ea/charserverhandler.cpp | 28 ---------------------------- src/net/ea/charserverhandler.h | 5 ----- 2 files changed, 33 deletions(-) (limited to 'src/net/ea') diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index 90b1cfba9..b7ec866f5 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -248,32 +248,4 @@ void CharServerHandler::clear() mCharacters.clear(); } -void CharServerHandler::processChangeMapServer(Net::MessageIn &restrict msg, - Network *restrict const network, - ServerInfo &restrict server) - const -{ - BLOCK_START("CharServerHandler::processChangeMapServer") - GameHandler *const gh = static_cast(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 Ea diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index ebafea22c..42e9b73fe 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -76,11 +76,6 @@ class CharServerHandler notfinal : public Net::CharServerHandler virtual void processCharDeleteFailed(Net::MessageIn &msg); - virtual void processChangeMapServer(Net::MessageIn &restrict msg, - Network *restrict const network, - ServerInfo &restrict mapServer) - const; - virtual void clear() override final; protected: -- cgit v1.2.3-70-g09d2