diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-02-27 13:25:41 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-02-27 13:25:41 +0300 |
commit | c61f1b6abe8e68995f00ae3a939afe5049e5cdb3 (patch) | |
tree | c50613a2c7722fba4aba9d5a67949b118a279b33 /src/gui/windows/serverdialog.cpp | |
parent | b481cd74dfd1629ca7b045cde57562e752c49638 (diff) | |
download | manaplus-c61f1b6abe8e68995f00ae3a939afe5049e5cdb3.tar.gz manaplus-c61f1b6abe8e68995f00ae3a939afe5049e5cdb3.tar.bz2 manaplus-c61f1b6abe8e68995f00ae3a939afe5049e5cdb3.tar.xz manaplus-c61f1b6abe8e68995f00ae3a939afe5049e5cdb3.zip |
Remove manaserv ifdefs code.
ManaServ was already depricated long ago.
Diffstat (limited to 'src/gui/windows/serverdialog.cpp')
-rw-r--r-- | src/gui/windows/serverdialog.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 579e9ad18..faae75ab3 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -63,20 +63,12 @@ static std::string serverTypeToString(const ServerInfo::Type type) return "TmwAthena"; case ServerInfo::EVOL: return "Evol"; -#ifdef EATHENA_SUPPORT case ServerInfo::EATHENA: +#ifdef EATHENA_SUPPORT return "eAthena"; #endif -#ifdef MANASERV_SUPPORT - case ServerInfo::MANASERV: - return "ManaServ"; -#else - case ServerInfo::MANASERV: -#endif -#ifndef EATHENA_SUPPORT - case ServerInfo::EATHENA: -#endif default: + case ServerInfo::MANASERV: case ServerInfo::UNKNOWN: return ""; } @@ -90,20 +82,12 @@ static uint16_t defaultPortForServerType(const ServerInfo::Type type) case ServerInfo::EATHENA: #ifdef EATHENA_SUPPORT return 6900; -#else - return 6901; #endif case ServerInfo::UNKNOWN: case ServerInfo::TMWATHENA: case ServerInfo::EVOL: -#ifdef MANASERV_SUPPORT - return 6901; - case ServerInfo::MANASERV: - return 9601; -#else case ServerInfo::MANASERV: return 6901; -#endif } } |