From 79e4325192f3260ed4ded264e43da8429650bf72 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Wed, 23 Oct 2024 12:04:54 +0200 Subject: Removed needless case-insensitive string comparisons These are not necessary since we can instead make sure the referenced values match case, like we do for everything else. This affects server types in the server list and colors referenced in theme files. The server version was also compared case-insensitively for some reason. --- src/net/manaserv/charhandler.cpp | 1 + src/net/serverinfo.h | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/net') diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp index 4d44aa93..8afbb90b 100644 --- a/src/net/manaserv/charhandler.cpp +++ b/src/net/manaserv/charhandler.cpp @@ -44,6 +44,7 @@ #include "utils/dtor.h" #include "utils/gettext.h" +#include "utils/stringutils.h" extern Net::CharHandler *charHandler; extern ManaServ::GameHandler *gameHandler; diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index d9520c1c..a9dc785c 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -21,8 +21,6 @@ #pragma once -#include "utils/stringutils.h" - #include #include #include @@ -74,12 +72,12 @@ public: static ServerType parseType(const std::string &type) { - if (compareStrI(type, "tmwathena") == 0) + if (type == "tmwathena") return ServerType::TMWATHENA; // Used for backward compatibility - if (compareStrI(type, "eathena") == 0) + if (type == "eathena") return ServerType::TMWATHENA; - if (compareStrI(type, "manaserv") == 0) + if (type == "manaserv") return ServerType::MANASERV; return ServerType::UNKNOWN; } -- cgit v1.2.3-70-g09d2