summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-11-06 00:13:06 +0300
committerAndrei Karas <akaras@inbox.ru>2014-11-06 00:13:06 +0300
commit6245aed671abe032d47db8b0bce7d7b3f3ca522a (patch)
treeecc1a5c4b5f18c3554c1dcbf7c82ce7f3ad4e704 /src/net
parent4cac7fcfd4ee4fc7c5ca6bd932de39bb28ed2ea3 (diff)
downloadmv-6245aed671abe032d47db8b0bce7d7b3f3ca522a.tar.gz
mv-6245aed671abe032d47db8b0bce7d7b3f3ca522a.tar.bz2
mv-6245aed671abe032d47db8b0bce7d7b3f3ca522a.tar.xz
mv-6245aed671abe032d47db8b0bce7d7b3f3ca522a.zip
Add server type Evol2.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/net.cpp1
-rw-r--r--src/net/serverinfo.h7
2 files changed, 7 insertions, 1 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 9822b0f03..9ae41a72b 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -118,6 +118,7 @@ void connectToServer(const ServerInfo &server)
switch (server.type)
{
case ServerInfo::EATHENA:
+ case ServerInfo::EVOL2:
#ifdef EATHENA_SUPPORT
new EAthena::GeneralHandler;
#else
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index af53577e6..019c6fd18 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -40,7 +40,8 @@ class ServerInfo final
UNKNOWN = 0,
TMWATHENA,
EVOL,
- EATHENA
+ EATHENA,
+ EVOL2
};
typedef std::pair<int, std::string> VersionString;
@@ -150,9 +151,13 @@ class ServerInfo final
#ifdef EATHENA_SUPPORT
else if (compareStrI(serverType, "eathena") == 0)
return EATHENA;
+ else if (compareStrI(serverType, "evol2") == 0)
+ return EVOL2;
#else
else if (compareStrI(serverType, "eathena") == 0)
return TMWATHENA;
+ else if (compareStrI(serverType, "evol2") == 0)
+ return TMWATHENA;
#endif
return UNKNOWN;
}