diff options
-rw-r--r-- | src/net/eathena/loginhandler.cpp | 8 | ||||
-rw-r--r-- | src/net/eathena/protocol.h | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp index 99017dfdc..a1843b5bf 100644 --- a/src/net/eathena/loginhandler.cpp +++ b/src/net/eathena/loginhandler.cpp @@ -101,7 +101,8 @@ void LoginHandler::connect() return; mNetwork->connect(mServer); - MessageOut outMsg(CMSG_SERVER_VERSION_REQUEST); + if (client->getState() != STATE_LOGIN) + client->setState(STATE_LOGIN); } bool LoginHandler::isConnected() const @@ -109,7 +110,7 @@ bool LoginHandler::isConnected() const if (!mNetwork) return false; - return mVersionResponse && mNetwork->isConnected(); + return mNetwork->isConnected(); } void LoginHandler::disconnect() @@ -171,9 +172,6 @@ void LoginHandler::processServerVersion(Net::MessageIn &msg) serverVersion = 0; if (client->getState() != STATE_LOGIN) client->setState(STATE_LOGIN); - - // Leave this last - mVersionResponse = true; } void LoginHandler::processUpdateHost2(Net::MessageIn &msg) const diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index c1a3b016b..debfd8ab8 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -186,7 +186,6 @@ /********************************** * Packets from client to server * **********************************/ -#define CMSG_SERVER_VERSION_REQUEST 0x7530 // Custom change password packet #define CMSG_CHAR_PASSWORD_CHANGE 0x0061 |