diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-09-18 23:23:11 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-09-18 23:23:11 +0300 |
| commit | 7dc7b217107d18d531c569d2deab6ff1f62552d5 (patch) | |
| tree | 30753ed34988d26d86733c9d76b97c7b6d24a998 /src/net/serverinfo.h | |
| parent | dc6568962a32ddb6f231c629e7ad3373e9086b6c (diff) | |
| download | mv-7dc7b217107d18d531c569d2deab6ff1f62552d5.tar.gz mv-7dc7b217107d18d531c569d2deab6ff1f62552d5.tar.bz2 mv-7dc7b217107d18d531c569d2deab6ff1f62552d5.tar.xz mv-7dc7b217107d18d531c569d2deab6ff1f62552d5.zip | |
fix name conflicts.
Diffstat (limited to 'src/net/serverinfo.h')
| -rw-r--r-- | src/net/serverinfo.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index c9a2d4f91..2a2659569 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -126,21 +126,21 @@ public: port != other.port); } - static Type parseType(const std::string &type) A_WARN_UNUSED + static Type parseType(const std::string &serverType) A_WARN_UNUSED { - if (compareStrI(type, "tmwathena") == 0) + if (compareStrI(serverType, "tmwathena") == 0) return TMWATHENA; - if (compareStrI(type, "evol") == 0) + if (compareStrI(serverType, "evol") == 0) return EVOL; #ifdef EATHENA_SUPPORT - else if (compareStrI(type, "eathena") == 0) + else if (compareStrI(serverType, "eathena") == 0) return EATHENA; #else - else if (compareStrI(type, "eathena") == 0) + else if (compareStrI(serverType, "eathena") == 0) return TMWATHENA; #endif #ifdef MANASERV_SUPPORT - else if (compareStrI(type, "manaserv") == 0) + else if (compareStrI(serverType, "manaserv") == 0) return MANASERV; #endif return UNKNOWN; |