diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-03 14:50:53 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-03 14:50:53 +0300 |
| commit | d05183a9029d65224f73143a380f1631692a9257 (patch) | |
| tree | b6666dea4c4a37c072826a6ec62955dad8812415 /src/net | |
| parent | b643a5c48d53dbeca7672e3c8b5182f9d698abcb (diff) | |
| download | manaplus-d05183a9029d65224f73143a380f1631692a9257.tar.gz manaplus-d05183a9029d65224f73143a380f1631692a9257.tar.bz2 manaplus-d05183a9029d65224f73143a380f1631692a9257.tar.xz manaplus-d05183a9029d65224f73143a380f1631692a9257.zip | |
Convert ServerType enum into strong typed enum.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/net.cpp | 4 | ||||
| -rw-r--r-- | src/net/net.h | 2 | ||||
| -rw-r--r-- | src/net/serverinfo.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp index f37914966..9b31499dd 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -115,7 +115,7 @@ Net::QuestHandler *questHandler = nullptr; namespace Net { -ServerType::Type networkType = ServerType::UNKNOWN; +ServerTypeT networkType = ServerType::UNKNOWN; std::set<int> ignorePackets; void connectToServer(const ServerInfo &server) @@ -173,7 +173,7 @@ void unload() ignorePackets.clear(); } -ServerType::Type getNetworkType() +ServerTypeT getNetworkType() { return networkType; } diff --git a/src/net/net.h b/src/net/net.h index ccd363b81..59a0891a2 100644 --- a/src/net/net.h +++ b/src/net/net.h @@ -36,7 +36,7 @@ namespace Net { -ServerType::Type getNetworkType() A_WARN_UNUSED; +ServerTypeT getNetworkType() A_WARN_UNUSED; /** * Handles server detection and connection diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index e96f7d8ea..04e967581 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -34,7 +34,7 @@ class ServerInfo final public: typedef std::pair<int, std::string> VersionString; - ServerType::Type type; + ServerTypeT type; std::string name; std::string hostname; std::string althostname; @@ -126,8 +126,8 @@ class ServerInfo final port != other.port); } - static ServerType::Type parseType(const std::string &serverType) - A_WARN_UNUSED + static ServerTypeT parseType(const std::string &serverType) + A_WARN_UNUSED { #ifdef TMWA_SUPPORT if (compareStrI(serverType, "tmwathena") == 0) |