summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-30 11:07:08 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-30 16:37:02 +0300
commite46cf607a4da55fc77b6b2ea7fca53d69ec6e56b (patch)
treee829744b50cab41c5f72c2a99a1fef971c2b9077 /src/net/ea
parent3bea3e2804fbec4c7697d29af46c6330b1ca9b92 (diff)
downloadmanaplus-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/ea')
-rw-r--r--src/net/ea/charserverhandler.cpp28
-rw-r--r--src/net/ea/charserverhandler.h5
2 files changed, 0 insertions, 33 deletions
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<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 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: