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

VMManager: Don't use achievements when playing GS dumps

This commit is contained in:
Stenzek 2024-06-24 21:27:43 +10:00 committed by Connor McLaughlin
parent c44500ba0f
commit 107c117a4e
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pcsx2/VMManager.cpp
View File

@ -1097,14 +1097,16 @@ void VMManager::UpdateDiscDetails(bool booting)
Patch::ReloadPatches(s_disc_serial, HasBootedELF() ? s_current_crc : 0, true, true, false, false); Patch::ReloadPatches(s_disc_serial, HasBootedELF() ? s_current_crc : 0, true, true, false, false);
ReportGameChangeToHost(); ReportGameChangeToHost();
Achievements::GameChanged(s_disc_crc, s_current_crc);
if (MTGS::IsOpen()) if (MTGS::IsOpen())
MTGS::GameChanged(); MTGS::GameChanged();
ReloadPINE();
UpdateDiscordPresence(s_state.load(std::memory_order_relaxed) == VMState::Initializing);
if (!GSDumpReplayer::IsReplayingDump()) if (!GSDumpReplayer::IsReplayingDump())
{
Achievements::GameChanged(s_disc_crc, s_current_crc);
ReloadPINE();
UpdateDiscordPresence(s_state.load(std::memory_order_relaxed) == VMState::Initializing);
FileMcd_Reopen(memcardFilters.empty() ? s_disc_serial : memcardFilters); FileMcd_Reopen(memcardFilters.empty() ? s_disc_serial : memcardFilters);
}
} }
void VMManager::ClearDiscDetails() void VMManager::ClearDiscDetails()
@ -1399,13 +1401,13 @@ bool VMManager::Initialize(VMBootParameters boot_params)
// Why do we need the boot param? Because we need some way of telling BootSystem() that // Why do we need the boot param? Because we need some way of telling BootSystem() that
// the user allowed HC mode to be disabled, because otherwise we'll ResetHardcoreMode() // the user allowed HC mode to be disabled, because otherwise we'll ResetHardcoreMode()
// and send ourselves into an infinite loop. // and send ourselves into an infinite loop.
if (boot_params.disable_achievements_hardcore_mode) if (boot_params.disable_achievements_hardcore_mode || GSDumpReplayer::IsReplayingDump())
Achievements::DisableHardcoreMode(); Achievements::DisableHardcoreMode();
else else
Achievements::ResetHardcoreMode(true); Achievements::ResetHardcoreMode(true);
if (Achievements::IsHardcoreModeActive()) if (Achievements::IsHardcoreModeActive())
{ {
auto confirmHardcoreModeDisable = [&boot_params, &state_to_load](const char* trigger) mutable { auto confirm_hc_mode_disable = [&boot_params, &state_to_load](const char* trigger) mutable {
if (FullscreenUI::IsInitialized()) if (FullscreenUI::IsInitialized())
{ {
boot_params.elf_override = std::move(s_elf_override); boot_params.elf_override = std::move(s_elf_override);
@ -1415,9 +1417,9 @@ bool VMManager::Initialize(VMBootParameters boot_params)
Achievements::ConfirmHardcoreModeDisableAsync(trigger, Achievements::ConfirmHardcoreModeDisableAsync(trigger,
[boot_params = std::move(boot_params)](bool approved) mutable { [boot_params = std::move(boot_params)](bool approved) mutable {
if (approved && Initialize(std::move(boot_params))) if (approved && Initialize(std::move(boot_params)))
SetState(VMState::Running); SetState(VMState::Running);
}); });
return false; return false;
} }
@ -1430,17 +1432,13 @@ bool VMManager::Initialize(VMBootParameters boot_params)
if (!state_to_load.empty()) if (!state_to_load.empty())
{ {
if (!confirmHardcoreModeDisable(TRANSLATE("VMManager", "Resuming state"))) if (!confirm_hc_mode_disable(TRANSLATE("VMManager", "Resuming state")))
{
return false; return false;
}
} }
if (DebugInterface::getPauseOnEntry()) if (DebugInterface::getPauseOnEntry())
{ {
if (!confirmHardcoreModeDisable(TRANSLATE("VMManager", "Boot and Debug"))) if (!confirm_hc_mode_disable(TRANSLATE("VMManager", "Boot and Debug")))
{
return false; return false;
}
} }
} }
@ -1686,7 +1684,7 @@ void VMManager::Reset()
return; return;
// Re-enforce hardcode mode constraints if we're now enabling it. // Re-enforce hardcode mode constraints if we're now enabling it.
if (Achievements::ResetHardcoreMode(false)) if (!GSDumpReplayer::IsReplayingDump() && Achievements::ResetHardcoreMode(false))
ApplySettings(); ApplySettings();
vu1Thread.WaitVU(); vu1Thread.WaitVU();