summaryrefslogtreecommitdiff
path: root/src/net/net.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 18:27:23 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 18:27:23 +0300
commit1db4d18ed1c04548ce8414adfb4e7cf830b39279 (patch)
tree4534efeb99af72798c8074a23a4b47a5bf6b3e75 /src/net/net.cpp
parent088ce632451aef33f28801029aaded8c5a4c9dac (diff)
downloadmanaverse-1db4d18ed1c04548ce8414adfb4e7cf830b39279.tar.gz
manaverse-1db4d18ed1c04548ce8414adfb4e7cf830b39279.tar.bz2
manaverse-1db4d18ed1c04548ce8414adfb4e7cf830b39279.tar.xz
manaverse-1db4d18ed1c04548ce8414adfb4e7cf830b39279.zip
Move servertype enum into separate file.
Diffstat (limited to 'src/net/net.cpp')
-rw-r--r--src/net/net.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 6c832e5f4..e744786cd 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -102,7 +102,7 @@ Net::MarketHandler *marketHandler = nullptr;
namespace Net
{
-ServerInfo::Type networkType = ServerInfo::UNKNOWN;
+ServerType::Type networkType = ServerType::UNKNOWN;
std::set<int> ignorePackets;
void connectToServer(const ServerInfo &server)
@@ -114,22 +114,22 @@ void connectToServer(const ServerInfo &server)
}
else
{
- if (networkType != ServerInfo::UNKNOWN && generalHandler)
+ if (networkType != ServerType::UNKNOWN && generalHandler)
generalHandler->unload();
switch (server.type)
{
- case ServerInfo::EATHENA:
- case ServerInfo::EVOL2:
+ case ServerType::EATHENA:
+ case ServerType::EVOL2:
#ifdef EATHENA_SUPPORT
new EAthena::GeneralHandler;
#else
new TmwAthena::GeneralHandler;
#endif
break;
- case ServerInfo::TMWATHENA:
- case ServerInfo::EVOL:
- case ServerInfo::UNKNOWN:
+ case ServerType::TMWATHENA:
+ case ServerType::EVOL:
+ case ServerType::UNKNOWN:
default:
#ifdef TMWA_SUPPORT
new TmwAthena::GeneralHandler;
@@ -160,7 +160,7 @@ void unload()
ignorePackets.clear();
}
-ServerInfo::Type getNetworkType()
+ServerType::Type getNetworkType()
{
return networkType;
}