diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/loginhandler.cpp | 5 | ||||
| -rw-r--r-- | src/net/loginhandler.h | 5 | ||||
| -rw-r--r-- | src/net/messagein.cpp | 5 | ||||
| -rw-r--r-- | src/net/net.cpp | 10 | ||||
| -rw-r--r-- | src/net/serverinfo.h | 4 |
5 files changed, 1 insertions, 28 deletions
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 62514b10b..44d834b94 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -70,12 +70,7 @@ void LoginHandler::loginAccount(LoginData *const loginData1) const { if (loginData1) { - // Since we're attempting to use the tAthena protocol, - // let's reset the character slots to the good value, - // in case we just logged out a Manaserv server - // with a different config. loginData1->resetCharacterSlots(); - sendLoginRegister(loginData1->username, loginData1->password, ""); } } diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h index 0c3fa27ff..91c2e4603 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -36,11 +36,6 @@ namespace Net class LoginHandler { public: - /** - * This enum describes options specific to either eAthena or Manaserv. - * By querying for these flags, the GUI can adapt to the current - * server type dynamically. - */ enum OptionalAction { Unregister = 0x1, diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 81340ba33..a6008da42 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -97,10 +97,7 @@ uint8_t MessageIn::fromServerDirection(const uint8_t serverDir) case 7: return 9; case 8: -#ifdef MANASERV_SUPPORT - if (Net::getNetworkType() != ServerInfo::MANASERV) -#endif - return 8; + return 8; default: logger->log("incorrect direction: %d", static_cast<int>(serverDir)); diff --git a/src/net/net.cpp b/src/net/net.cpp index c7a4f33f7..6b744c673 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -32,10 +32,6 @@ #include "net/eathena/generalhandler.h" #endif -#ifdef MANASERV_SUPPORT -#include "net/manaserv/generalhandler.h" -#endif - #include "debug.h" Net::AdminHandler *adminHandler = nullptr; @@ -163,12 +159,6 @@ void connectToServer(const ServerInfo &server) #endif break; case ServerInfo::MANASERV: -#ifdef MANASERV_SUPPORT - new ManaServ::GeneralHandler; -#else - new TmwAthena::GeneralHandler; -#endif - break; case ServerInfo::TMWATHENA: case ServerInfo::UNKNOWN: default: diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index 0b17184fd..6035a1f51 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -139,10 +139,6 @@ public: else if (compareStrI(serverType, "eathena") == 0) return TMWATHENA; #endif -#ifdef MANASERV_SUPPORT - else if (compareStrI(serverType, "manaserv") == 0) - return MANASERV; -#endif return UNKNOWN; } }; |