dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-16 04:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13858 from LillyJadeKatrin/retroachievements-message-adjustments

Browse Source 
Retroachievements message adjustments
This commit is contained in:
JosJuice 2025-11-07 16:50:48 +01:00 committed by GitHub
commit 5ed4823ebc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/Core/AchievementManager.cpp
View File

@ -927,6 +927,7 @@ void AchievementManager::LoginCallback(int result, const char* error_message, rc
{ {
WARN_LOG_FMT(ACHIEVEMENTS, "Failed to login {} to RetroAchievements server.", WARN_LOG_FMT(ACHIEVEMENTS, "Failed to login {} to RetroAchievements server.",
Config::Get(Config::RA_USERNAME)); Config::Get(Config::RA_USERNAME));
Config::SetBaseOrCurrent(Config::RA_API_TOKEN, "");
instance.update_event.Trigger({.failed_login_code = result}); instance.update_event.Trigger({.failed_login_code = result});
return; return;
} }
@ -1022,6 +1023,18 @@ void AchievementManager::LoadGameCallback(int result, const char* error_message,
OSD::Color::RED); OSD::Color::RED);
return; return;
} }
if (result == RC_LOGIN_REQUIRED || result == RC_INVALID_CREDENTIALS || result == RC_EXPIRED_TOKEN)
{
WARN_LOG_FMT(ACHIEVEMENTS, "Invalid/expired RetroAchievements API token.");
OSD::AddMessage(
"You have been logged out from RetroAchievements due to invalid/expired credentials.",
OSD::Duration::VERY_LONG, OSD::Color::RED);
OSD::AddMessage("Please close the game to log back in before continuing.",
OSD::Duration::VERY_LONG, OSD::Color::RED);
Config::SetBaseOrCurrent(Config::RA_API_TOKEN, "");
instance.update_event.Trigger(UpdatedItems{.failed_login_code = result});
return;
}
auto* game = rc_client_get_game_info(client); auto* game = rc_client_get_game_info(client);
if (result == RC_OK) if (result == RC_OK)
@ -1266,7 +1279,7 @@ void AchievementManager::HandleGameCompletedEvent(const rc_client_event_t* clien
return; return;
} }
bool hardcore = rc_client_get_hardcore_enabled(client); bool hardcore = rc_client_get_hardcore_enabled(client);
OSD::AddMessage(fmt::format("Congratulations! {} has {} {}", user_info->display_name, OSD::AddMessage(fmt::format("Congratulations, {}! You have {} {}", user_info->display_name,
hardcore ? "mastered" : "completed", game_info->title), hardcore ? "mastered" : "completed", game_info->title),
OSD::Duration::VERY_LONG, hardcore ? OSD::Color::YELLOW : OSD::Color::CYAN, OSD::Duration::VERY_LONG, hardcore ? OSD::Color::YELLOW : OSD::Color::CYAN,
&AchievementManager::GetInstance().GetGameBadge()); &AchievementManager::GetInstance().GetGameBadge());

4
Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp
View File

@ -42,6 +42,10 @@ void AchievementSettingsWidget::UpdateData(int login_failed_code)
{ {
switch (login_failed_code) switch (login_failed_code)
{ {
case RC_LOGIN_REQUIRED:
case RC_EXPIRED_TOKEN:
m_common_login_failed->setText(tr("Logged Out - Credentials Expired"));
break;
case RC_INVALID_CREDENTIALS: case RC_INVALID_CREDENTIALS:
m_common_login_failed->setText(tr("Login Failed - Invalid Username/Password")); m_common_login_failed->setText(tr("Login Failed - Invalid Username/Password"));
break; break;