diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-05-19 02:24:20 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-05-19 02:24:20 +0300 |
| commit | 886522371299b45254b7dc72e6de3070703d7c10 (patch) | |
| tree | 738745eab76eb5f55a9adc08bfac10077b07efac /src/net | |
| parent | 7cd309e7c9e0200cedb45edfeeba5a601d3fb446 (diff) | |
| download | mv-886522371299b45254b7dc72e6de3070703d7c10.tar.gz mv-886522371299b45254b7dc72e6de3070703d7c10.tar.bz2 mv-886522371299b45254b7dc72e6de3070703d7c10.tar.xz mv-886522371299b45254b7dc72e6de3070703d7c10.zip | |
Enable server type selection again. Add evol server type. Now working same as tmweathena.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/messagein.cpp | 2 | ||||
| -rw-r--r-- | src/net/net.cpp | 3 | ||||
| -rw-r--r-- | src/net/serverinfo.h | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 12d086207..9b76c76fa 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -116,7 +116,7 @@ void MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction) break; case 8: #ifdef MANASERV_SUPPORT - if (Net::getNetworkType() == ServerInfo::TMWATHENA) + if (Net::getNetworkType() != ServerInfo::MANASERV) #endif { direction = 8; diff --git a/src/net/net.cpp b/src/net/net.cpp index 052d65edc..ca26415a6 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -160,6 +160,9 @@ void connectToServer(const ServerInfo &server) switch (server.type) { + case ServerInfo::EVOL: + new TmwAthena::GeneralHandler; + break; case ServerInfo::MANASERV: #ifdef MANASERV_SUPPORT new ManaServ::GeneralHandler; diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index 2e8d63a6e..eb07f766e 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -35,7 +35,8 @@ public: { UNKNOWN = 0, MANASERV, - TMWATHENA + TMWATHENA, + EVOL }; typedef std::pair<int, std::string> VersionString; @@ -103,6 +104,8 @@ public: { if (compareStrI(type, "tmwathena") == 0) return TMWATHENA; + if (compareStrI(type, "evol") == 0) + return EVOL; // Used for backward compatibility else if (compareStrI(type, "eathena") == 0) return TMWATHENA; |