From 3bea3e2804fbec4c7697d29af46c6330b1ca9b92 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 30 Aug 2014 01:46:52 +0300
Subject: Remove additional parameters from processCharMapInfo function.

---
 src/net/ea/charserverhandler.cpp | 35 -----------------------------------
 src/net/ea/charserverhandler.h   |  4 ----
 2 files changed, 39 deletions(-)

(limited to 'src/net/ea')

diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 9b747ed49..90b1cfba9 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -248,41 +248,6 @@ void CharServerHandler::clear()
     mCharacters.clear();
 }
 
-void CharServerHandler::processCharMapInfo(Net::MessageIn &restrict msg,
-                                           Network *restrict const network,
-                                           ServerInfo &restrict server)
-{
-    BLOCK_START("CharServerHandler::processCharMapInfo")
-//    msg.skip(4); // CharID, must be the same as localPlayer->charID
-    PlayerInfo::setCharId(msg.readInt32());
-    GameHandler *const gh = static_cast<GameHandler*>(Net::getGameHandler());
-    gh->setMap(msg.readString(16));
-    if (config.getBoolValue("usePersistentIP") || settings.persistentIp)
-    {
-        msg.readInt32();
-        server.hostname = settings.serverName;
-    }
-    else
-    {
-        server.hostname = ipToString(msg.readInt32());
-    }
-    server.port = msg.readInt16();
-
-    // Prevent the selected local player from being deleted
-    localPlayer = mSelectedCharacter->dummy;
-    PlayerInfo::setBackend(mSelectedCharacter->data);
-
-    mSelectedCharacter->dummy = nullptr;
-
-    Net::getCharServerHandler()->clear();
-    updateCharSelectDialog();
-
-    if (network)
-        network->disconnect();
-    client->setState(STATE_CONNECT_GAME);
-    BLOCK_END("CharServerHandler::processCharMapInfo")
-}
-
 void CharServerHandler::processChangeMapServer(Net::MessageIn &restrict msg,
                                                Network *restrict const network,
                                                ServerInfo &restrict server)
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index e86965f6b..ebafea22c 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -76,10 +76,6 @@ class CharServerHandler notfinal : public Net::CharServerHandler
 
         virtual void processCharDeleteFailed(Net::MessageIn &msg);
 
-        virtual void processCharMapInfo(Net::MessageIn &restrict msg,
-                                        Network *restrict const network,
-                                        ServerInfo &restrict mapServer);
-
         virtual void processChangeMapServer(Net::MessageIn &restrict msg,
                                             Network *restrict const network,
                                             ServerInfo &restrict mapServer)
-- 
cgit v1.2.3-60-g2f50