From 8d6fcf2a84eaa0636989a24304cbc9ee4dd20cc1 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" <277429+mackal@users.noreply.github.com> Date: Fri, 8 Jul 2022 00:07:07 -0400 Subject: [PATCH] Fix string comparison issues in Client::SendZoneFlagInfo (#2290) clang complained about these --- zone/zoning.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zone/zoning.cpp b/zone/zoning.cpp index 916e81a88..d2a6b439e 100644 --- a/zone/zoning.cpp +++ b/zone/zoning.cpp @@ -1044,7 +1044,7 @@ void Client::SendZoneFlagInfo(Client *to) const { for (const auto& zone_id : zone_flags) { int flag_number = (flag_count + 1); const char* zone_short_name = ZoneName(zone_id, true); - if (zone_short_name != "UNKNOWN") { + if (strncmp(zone_short_name, "UNKNOWN", strlen(zone_short_name)) != 0) { std::string zone_long_name = ZoneLongName(zone_id); float safe_x, safe_y, safe_z, safe_heading; int16 min_status = AccountStatus::Player; @@ -1073,7 +1073,7 @@ void Client::SendZoneFlagInfo(Client *to) const { zone_long_name, zone_short_name, ( - flag_name != "" ? + flag_name[0] != '\0' ? fmt::format( " Flag Required: {}", flag_name