starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-04 05:04:33 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

Achievements: Preserve hardcore mode when toggling encore/spectator/unofficial settings (#3661)

Browse Source
This commit is contained in:
mariobob
2025-12-17 04:02:36 +01:00
committed by GitHub
parent 93f62c4292
commit bc72d58fd9
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/achievements.cpp
View File

@@ -706,28 +706,25 @@ void Achievements::UpdateSettings(const Settings& old_config)
DisableHardcoreMode(true, true);
}
// These cannot be modified while a game is loaded, so just toss state and reload.
auto lock = GetLock();
if (HasActiveGame())
const bool encore_mode_changed = (g_settings.achievements_encore_mode != old_config.achievements_encore_mode);
const bool spectator_mode_changed = (g_settings.achievements_spectator_mode != old_config.achievements_spectator_mode);
const bool unofficial_test_mode_changed = (g_settings.achievements_unofficial_test_mode != old_config.achievements_unofficial_test_mode);
if (encore_mode_changed)
rc_client_set_encore_mode_enabled(s_state.client, g_settings.achievements_encore_mode);
if (spectator_mode_changed)
rc_client_set_spectator_mode_enabled(s_state.client, g_settings.achievements_spectator_mode);
if (unofficial_test_mode_changed)
rc_client_set_unofficial_enabled(s_state.client, g_settings.achievements_unofficial_test_mode);
// If a game is active and these settings changed, reload the game to apply them.
// Just unload and reload without destroying the client to preserve hardcore mode.
if (HasActiveGame() && (encore_mode_changed || spectator_mode_changed || unofficial_test_mode_changed))
{
lock.unlock();
if (g_settings.achievements_encore_mode != old_config.achievements_encore_mode ||
g_settings.achievements_spectator_mode != old_config.achievements_spectator_mode ||
g_settings.achievements_unofficial_test_mode != old_config.achievements_unofficial_test_mode)
{
Shutdown();
Initialize();
return;
}
}
else
{
if (g_settings.achievements_encore_mode != old_config.achievements_encore_mode)
rc_client_set_encore_mode_enabled(s_state.client, g_settings.achievements_encore_mode);
if (g_settings.achievements_spectator_mode != old_config.achievements_spectator_mode)
rc_client_set_spectator_mode_enabled(s_state.client, g_settings.achievements_spectator_mode);
if (g_settings.achievements_unofficial_test_mode != old_config.achievements_unofficial_test_mode)
rc_client_set_unofficial_enabled(s_state.client, g_settings.achievements_unofficial_test_mode);
ClearGameInfo();
BeginLoadGame();
return;
}
if (!g_settings.achievements_leaderboard_trackers)