diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-11-21 12:33:51 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-11-21 12:33:51 -0700 |
| commit | ce7fd00212d225453f2365b4e54b984bea32cdb0 (patch) | |
| tree | 961c1570b8586b3eee58b8e4f5fd60d4483dbfad | |
| parent | 5c8a2bb5349b71040b74bc44e10db0b80290e904 (diff) | |
| download | mana-ce7fd00212d225453f2365b4e54b984bea32cdb0.tar.gz mana-ce7fd00212d225453f2365b4e54b984bea32cdb0.tar.bz2 mana-ce7fd00212d225453f2365b4e54b984bea32cdb0.tar.xz mana-ce7fd00212d225453f2365b4e54b984bea32cdb0.zip | |
Remove another support ifdef
| -rw-r--r-- | src/main.cpp | 4 | ||||
| -rw-r--r-- | src/net/manaserv/loginhandler.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index 16a5cb1c..459037ef 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -869,10 +869,6 @@ int main(int argc, char *argv[]) Net::getGameHandler()->isConnected()) { Net::getLoginHandler()->disconnect(); - -#ifdef MANASERV_SUPPORT - state = STATE_GAME; -#endif } else if (state == STATE_CONNECT_SERVER && oldstate == STATE_CHOOSE_SERVER) { diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp index 615abc51..4a0339b4 100644 --- a/src/net/manaserv/loginhandler.cpp +++ b/src/net/manaserv/loginhandler.cpp @@ -301,6 +301,11 @@ bool LoginHandler::isConnected() void LoginHandler::disconnect() { accountServerConnection->disconnect(); + + if (state == STATE_CONNECT_GAME) + { + state = STATE_GAME; + } } void LoginHandler::loginAccount(LoginData *loginData) |