mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-25 07:09:48 -06:00
AchievementManager: Convert .compare() into equality operators
These perform a default comparison, which is the same as using the equality operators.
This commit is contained in:
@ -459,20 +459,20 @@ void AchievementManager::FetchBadges()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
int badgematch = 0;
|
bool badgematch = false;
|
||||||
{
|
{
|
||||||
std::lock_guard lg{m_lock};
|
std::lock_guard lg{m_lock};
|
||||||
badgematch = m_game_badge.name.compare(m_game_data.image_name);
|
badgematch = m_game_badge.name == m_game_data.image_name;
|
||||||
}
|
}
|
||||||
if (badgematch != 0)
|
if (!badgematch)
|
||||||
{
|
{
|
||||||
m_image_queue.EmplaceItem([this] {
|
m_image_queue.EmplaceItem([this] {
|
||||||
std::string name_to_fetch;
|
std::string name_to_fetch;
|
||||||
{
|
{
|
||||||
std::lock_guard lg{m_lock};
|
std::lock_guard lg{m_lock};
|
||||||
if (m_game_badge.name.compare(m_game_data.image_name) == 0)
|
if (m_game_badge.name == m_game_data.image_name)
|
||||||
return;
|
return;
|
||||||
name_to_fetch.assign(m_game_data.image_name);
|
name_to_fetch = m_game_data.image_name;
|
||||||
}
|
}
|
||||||
rc_api_fetch_image_request_t icon_request = {.image_name = name_to_fetch.c_str(),
|
rc_api_fetch_image_request_t icon_request = {.image_name = name_to_fetch.c_str(),
|
||||||
.image_type = RC_IMAGE_TYPE_GAME};
|
.image_type = RC_IMAGE_TYPE_GAME};
|
||||||
@ -481,7 +481,7 @@ void AchievementManager::FetchBadges()
|
|||||||
{
|
{
|
||||||
INFO_LOG_FMT(ACHIEVEMENTS, "Successfully downloaded game badge id {}.", name_to_fetch);
|
INFO_LOG_FMT(ACHIEVEMENTS, "Successfully downloaded game badge id {}.", name_to_fetch);
|
||||||
std::lock_guard lg{m_lock};
|
std::lock_guard lg{m_lock};
|
||||||
if (name_to_fetch.compare(m_game_data.image_name) != 0)
|
if (name_to_fetch != m_game_data.image_name)
|
||||||
{
|
{
|
||||||
INFO_LOG_FMT(ACHIEVEMENTS, "Requested outdated badge id {} for game id {}.",
|
INFO_LOG_FMT(ACHIEVEMENTS, "Requested outdated badge id {} for game id {}.",
|
||||||
name_to_fetch, m_game_data.image_name);
|
name_to_fetch, m_game_data.image_name);
|
||||||
@ -537,7 +537,7 @@ void AchievementManager::FetchBadges()
|
|||||||
index);
|
index);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
name_to_fetch.assign(achievement.badge_name);
|
name_to_fetch = achievement.badge_name;
|
||||||
current_name = unlock_itr->second.unlocked_badge.name;
|
current_name = unlock_itr->second.unlocked_badge.name;
|
||||||
}
|
}
|
||||||
if (current_name == name_to_fetch)
|
if (current_name == name_to_fetch)
|
||||||
@ -565,7 +565,7 @@ void AchievementManager::FetchBadges()
|
|||||||
"Fetched unlocked badge for achievement id {} not in unlock map.", index);
|
"Fetched unlocked badge for achievement id {} not in unlock map.", index);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (name_to_fetch.compare(achievement.badge_name) != 0)
|
if (name_to_fetch != achievement.badge_name)
|
||||||
{
|
{
|
||||||
INFO_LOG_FMT(
|
INFO_LOG_FMT(
|
||||||
ACHIEVEMENTS,
|
ACHIEVEMENTS,
|
||||||
@ -608,7 +608,7 @@ void AchievementManager::FetchBadges()
|
|||||||
"Attempted to fetch locked badge for achievement id {} not in unlock map.", index);
|
"Attempted to fetch locked badge for achievement id {} not in unlock map.", index);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
name_to_fetch.assign(achievement.badge_name);
|
name_to_fetch = achievement.badge_name;
|
||||||
current_name = unlock_itr->second.locked_badge.name;
|
current_name = unlock_itr->second.locked_badge.name;
|
||||||
}
|
}
|
||||||
if (current_name == name_to_fetch)
|
if (current_name == name_to_fetch)
|
||||||
@ -636,7 +636,7 @@ void AchievementManager::FetchBadges()
|
|||||||
"Fetched locked badge for achievement id {} not in unlock map.", index);
|
"Fetched locked badge for achievement id {} not in unlock map.", index);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (name_to_fetch.compare(achievement.badge_name) != 0)
|
if (name_to_fetch != achievement.badge_name)
|
||||||
{
|
{
|
||||||
INFO_LOG_FMT(ACHIEVEMENTS,
|
INFO_LOG_FMT(ACHIEVEMENTS,
|
||||||
"Requested outdated locked achievement badge id {} for achievement id {}.",
|
"Requested outdated locked achievement badge id {} for achievement id {}.",
|
||||||
|
Reference in New Issue
Block a user