diff --git a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp index 09c43af7..8a293297 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp @@ -17,7 +17,7 @@ namespace { std::string className; entity.at("classname").get_to(className); - if (className.compare("worldspawn") != 0) + if (className != "worldspawn") { con::error("ERROR: first entity in the map entity string must be the worldspawn class!"); return false; diff --git a/src/ZoneCommon/Zone/Definition/Parsing/Sequence/SequenceZoneDefinitionMetaData.cpp b/src/ZoneCommon/Zone/Definition/Parsing/Sequence/SequenceZoneDefinitionMetaData.cpp index 8b40c24f..b435bef8 100644 --- a/src/ZoneCommon/Zone/Definition/Parsing/Sequence/SequenceZoneDefinitionMetaData.cpp +++ b/src/ZoneCommon/Zone/Definition/Parsing/Sequence/SequenceZoneDefinitionMetaData.cpp @@ -146,11 +146,12 @@ void SequenceZoneDefinitionMetaData::ProcessMatch(ZoneDefinitionParserState* sta { return std::tolower(c); }); - if (valueLowerCase.compare("sp") == 0) + + if (valueLowerCase == "sp") state->SetMapType(ZoneDefinitionMapType::SP); - else if (valueLowerCase.compare("mp") == 0) + else if (valueLowerCase == "mp") state->SetMapType(ZoneDefinitionMapType::MP); - else if (valueLowerCase.compare("zm") == 0) + else if (valueLowerCase == "zm") state->SetMapType(ZoneDefinitionMapType::ZM); else throw ParsingException(valueToken.GetPos(), "map must be SP, MP or ZM");