summaryrefslogtreecommitdiff
path: root/src/net/manaserv/gamehandler.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-07-14 09:21:17 -0600
committerJared Adams <jaxad0127@gmail.com>2010-08-13 19:30:53 -0600
commit07d6c28b6cbd83a73b0613bffe67be90a86d58ca (patch)
tree359981688402948c9a0e2af72a53fe083b69827d /src/net/manaserv/gamehandler.cpp
parent8eadc834ed3e8439836f7dc87390a56a1164ec11 (diff)
downloadmana-client-07d6c28b6cbd83a73b0613bffe67be90a86d58ca.tar.gz
mana-client-07d6c28b6cbd83a73b0613bffe67be90a86d58ca.tar.bz2
mana-client-07d6c28b6cbd83a73b0613bffe67be90a86d58ca.tar.xz
mana-client-07d6c28b6cbd83a73b0613bffe67be90a86d58ca.zip
Add code to change gameservers to manaserv netcode
Reviewed-by: Freeyorp
Diffstat (limited to 'src/net/manaserv/gamehandler.cpp')
-rw-r--r--src/net/manaserv/gamehandler.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/net/manaserv/gamehandler.cpp b/src/net/manaserv/gamehandler.cpp
index 271fff15..5e29a896 100644
--- a/src/net/manaserv/gamehandler.cpp
+++ b/src/net/manaserv/gamehandler.cpp
@@ -94,7 +94,10 @@ void GameHandler::handleMessage(Net::MessageIn &msg)
void GameHandler::connect()
{
gameServerConnection->connect(gameServer.hostname, gameServer.port);
- chatServerConnection->connect(chatServer.hostname, chatServer.port);
+
+ // Will already be connected if we just changed gameservers
+ if (!chatServerConnection->isConnected())
+ chatServerConnection->connect(chatServer.hostname, chatServer.port);
}
bool GameHandler::isConnected()
@@ -106,7 +109,10 @@ bool GameHandler::isConnected()
void GameHandler::disconnect()
{
gameServerConnection->disconnect();
- chatHandler->disconnect();
+
+ // No need if we're just changing gameservers
+ if (Client::getState() != STATE_CHANGE_MAP)
+ chatHandler->disconnect();
}
void GameHandler::inGame()