ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Achievements: Fix HC mode activating on reset of non-cheevo game

This commit is contained in:
Stenzek 2024-04-18 00:25:19 +10:00 committed by Connor McLaughlin
parent 3c901543bd
commit a9311142dc
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pcsx2/Achievements.cpp
View File

@ -125,7 +125,7 @@ namespace Achievements
static std::string GetGameHash(const std::string& elf_path);
static void SetHardcoreMode(bool enabled, bool force_display_message);
static bool IsLoggedInOrLoggingIn();
static bool IsUnknownGame();
static bool CanEnableHardcoreMode();
static void ShowLoginSuccess(const rc_client_t* client);
static void IdentifyGame(u32 disc_crc, u32 crc);
static void BeginLoadGame();
@ -510,7 +510,7 @@ void Achievements::UpdateSettings(const Pcsx2Config::AchievementsOptions& old_co
// Hardcore mode can only be enabled through reset (ResetChallengeMode()).
if (s_hardcore_mode && !EmuConfig.Achievements.HardcoreMode)
{
ResetHardcoreMode();
ResetHardcoreMode(false);
}
else if (!s_hardcore_mode && EmuConfig.Achievements.HardcoreMode)
{
@ -1393,7 +1393,7 @@ void Achievements::DisableHardcoreMode()
SetHardcoreMode(false, true);
}
bool Achievements::ResetHardcoreMode()
bool Achievements::ResetHardcoreMode(bool is_booting)
{
if (!IsActive())
return false;
@ -1407,7 +1407,10 @@ bool Achievements::ResetHardcoreMode()
// which gets called before ResetHardcoreMode().
const bool wanted_hardcore_mode = (IsLoggedInOrLoggingIn() || s_load_game_request) &&
EmuConfig.Achievements.HardcoreMode;
if (s_hardcore_mode == wanted_hardcore_mode || (wanted_hardcore_mode && IsUnknownGame()))
if (s_hardcore_mode == wanted_hardcore_mode)
return false;
if (!is_booting && wanted_hardcore_mode && !CanEnableHardcoreMode())
return false;
SetHardcoreMode(wanted_hardcore_mode, false);
@ -1608,9 +1611,9 @@ bool Achievements::IsLoggedInOrLoggingIn()
return (rc_client_get_user_info(s_client) != nullptr || s_login_request);
}
bool Achievements::IsUnknownGame()
bool Achievements::CanEnableHardcoreMode()
{
return (s_game_id == 0 && !s_load_game_request);
return (s_load_game_request || s_has_achievements || s_has_leaderboards);
}
bool Achievements::Login(const char* username, const char* password, Error* error)

2
pcsx2/Achievements.h
View File

@ -65,7 +65,7 @@ namespace Achievements
void GameChanged(u32 disc_crc, u32 crc);
/// Re-enables hardcode mode if it is enabled in the settings.
bool ResetHardcoreMode();
bool ResetHardcoreMode(bool is_booting);
/// Forces hardcore mode off until next reset.
void DisableHardcoreMode();

4
pcsx2/VMManager.cpp
View File

@ -1328,7 +1328,7 @@ bool VMManager::Initialize(VMBootParameters boot_params)
if (boot_params.disable_achievements_hardcore_mode)
Achievements::DisableHardcoreMode();
else
Achievements::ResetHardcoreMode();
Achievements::ResetHardcoreMode(true);
if (Achievements::IsHardcoreModeActive())
{
auto confirmHardcoreModeDisable = [&boot_params, &state_to_load](const char* trigger) mutable {
@ -1604,7 +1604,7 @@ void VMManager::Reset()
return;
// Re-enforce hardcode mode constraints if we're now enabling it.
if (Achievements::ResetHardcoreMode())
if (Achievements::ResetHardcoreMode(false))
ApplySettings();
vu1Thread.WaitVU();