From b6ea3b1b47ce01135a55018d4e53476180a30597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Wed, 5 Jul 2023 22:39:53 +0300 Subject: [PATCH] Avoid constructing temporary string object --- src/openrct2/localisation/LanguagePack.cpp | 2 +- src/openrct2/network/NetworkBase.cpp | 2 +- src/openrct2/network/NetworkUser.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2/localisation/LanguagePack.cpp b/src/openrct2/localisation/LanguagePack.cpp index ecfc250eb0..6038c655c3 100644 --- a/src/openrct2/localisation/LanguagePack.cpp +++ b/src/openrct2/localisation/LanguagePack.cpp @@ -162,7 +162,7 @@ public: int32_t ooIndex = 0; for (const ScenarioOverride& scenarioOverride : _scenarioOverrides) { - if (String::IEquals(scenarioOverride.filename.c_str(), scenarioFilename)) + if (String::IEquals(scenarioOverride.filename, scenarioFilename)) { if (scenarioOverride.strings[index].empty()) { diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 3f388033f4..2db4d44751 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -2113,7 +2113,7 @@ std::string NetworkBase::MakePlayerNameUnique(const std::string& name) // Check if there is already a player with this name in the server for (const auto& player : player_list) { - if (String::IEquals(player->Name.c_str(), new_name.c_str())) + if (String::IEquals(player->Name, new_name)) { unique = false; break; diff --git a/src/openrct2/network/NetworkUser.cpp b/src/openrct2/network/NetworkUser.cpp index d47bbed40c..c7b4cd80d2 100644 --- a/src/openrct2/network/NetworkUser.cpp +++ b/src/openrct2/network/NetworkUser.cpp @@ -186,7 +186,7 @@ const NetworkUser* NetworkUserManager::GetUserByName(const std::string& name) co for (const auto& kvp : _usersByHash) { const auto& networkUser = kvp.second; - if (String::IEquals(name.c_str(), networkUser->Name.c_str())) + if (String::IEquals(name, networkUser->Name)) { return networkUser.get(); }