From ad969dfc0d6586032f44b82477a304b21d50bfd0 Mon Sep 17 00:00:00 2001 From: LillyJadeKatrin Date: Wed, 1 May 2024 23:47:23 -0400 Subject: Disabled Hardcore Mode when Achievements disabled Bugfix for hardcore-disabled items being disabled when hardcore was true but achievement integration was false, which should mean hardcore is effectively disabled. Now everything checks the IsHardcoreModeActive method in AchievementManager which processes the setting AND the game state to determine if hardcore mode is actually active. --- Source/Core/DiscIO/RiivolutionPatcher.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DiscIO/RiivolutionPatcher.cpp') diff --git a/Source/Core/DiscIO/RiivolutionPatcher.cpp b/Source/Core/DiscIO/RiivolutionPatcher.cpp index 4a6f7bb2ad..7dc245d27b 100644 --- a/Source/Core/DiscIO/RiivolutionPatcher.cpp +++ b/Source/Core/DiscIO/RiivolutionPatcher.cpp @@ -14,7 +14,7 @@ #include "Common/FileUtil.h" #include "Common/IOFile.h" #include "Common/StringUtil.h" -#include "Core/Config/AchievementSettings.h" +#include "Core/AchievementManager.h" #include "Core/Core.h" #include "Core/HLE/HLE.h" #include "Core/HW/Memmap.h" @@ -525,7 +525,7 @@ static void ApplyMemoryPatch(const Core::CPUThreadGuard& guard, u32 offset, std::span value, std::span original) { #ifdef USE_RETRO_ACHIEVEMENTS - if (::Config::Get(::Config::RA_HARDCORE_ENABLED)) + if (AchievementManager::GetInstance().IsHardcoreModeActive()) return; #endif // USE_RETRO_ACHIEVEMENTS -- cgit v1.2.3