From 08c65b8c721c70268fa0693a7aafc5b828c37162 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 2 Nov 2009 22:06:18 +0200
Subject: Fixing disconnection bug.

And revert commit 30db6c4375f932370d4fce0c5b35a0cab93a2a18.
---
 src/main.cpp                     | 2 +-
 src/net/ea/charserverhandler.cpp | 1 -
 src/net/ea/gamehandler.cpp       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main.cpp b/src/main.cpp
index 865588ff..18a28fa2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -893,7 +893,7 @@ int main(int argc, char *argv[])
         {
             Net::getLoginHandler()->disconnect();
 
-            state = STATE_GAME;
+            //state = STATE_GAME;
         }
         else if (state == STATE_CONNECT_SERVER && oldstate == STATE_CHOOSE_SERVER)
         {
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index f2821792..f4b82aee 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -169,7 +169,6 @@ void CharServerHandler::handleMessage(MessageIn &msg)
                 mCharInfo->next();
             } while (mCharInfo->getPos());
 
-            sleep(3);
             mCharInfo->select(slot);
             mNetwork->disconnect();
             state = STATE_CONNECT_GAME;
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index 597fd1da..97862883 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -75,7 +75,7 @@ void GameHandler::handleMessage(MessageIn &msg)
             logger->log("Protocol: Player start position: (%d, %d), Direction: %d",
                     x, y, direction);
             // Switch now or we'll have problems
-            // state = STATE_GAME;
+            state = STATE_GAME;
             player_node->setTileCoords(x, y);
          }  break;
 
-- 
cgit v1.2.3-60-g2f50