From 7dc7b217107d18d531c569d2deab6ff1f62552d5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 18 Sep 2013 23:23:11 +0300 Subject: fix name conflicts. --- src/net/serverinfo.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/net/serverinfo.h') 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; -- cgit v1.2.3-60-g2f50