sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

System: Change "Auto Load Cheats" to "Enable Cheats"

Browse Source
This commit is contained in:
Stenzek
2024-03-03 13:43:04 +10:00
parent f4ffaa1e3c
commit e2024f6175
20 changed files with 235 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/core/system.cpp
View File

@ -3400,8 +3400,8 @@ void System::UpdateRunningGame(const char* path, CDImage* image, bool booting)
ApplySettings(true);
s_cheat_list.reset();
if (g_settings.auto_load_cheats && !Achievements::IsHardcoreModeActive())
LoadCheatListFromGameTitle();
if (g_settings.enable_cheats)
LoadCheatList();
if (s_running_game_serial != prev_serial)
UpdateSessionTime(prev_serial);
@ -3655,6 +3655,14 @@ void System::CheckForSettingsChanges(const Settings& old_settings)
CPU::ClearICache();
}
if (g_settings.enable_cheats != old_settings.enable_cheats)
{
if (g_settings.enable_cheats)
LoadCheatList();
else
s_cheat_list.reset();
}
SPU::GetOutputStream()->SetOutputVolume(GetAudioOutputVolume());
if (g_settings.gpu_resolution_scale != old_settings.gpu_resolution_scale ||
@ -4534,15 +4542,20 @@ std::string System::GetCheatFileName()
return ret;
}
bool System::LoadCheatList(const char* filename)
bool System::LoadCheatList()
{
if (System::IsShutdown())
// Called when booting, needs to test for shutdown.
if (IsShutdown() || !g_settings.enable_cheats)
return false;
const std::string filename(GetCheatFileName());
if (filename.empty() || !FileSystem::FileExists(filename.c_str()))
return false;
std::unique_ptr<CheatList> cl = std::make_unique<CheatList>();
if (!cl->LoadFromFile(filename, CheatList::Format::Autodetect))
if (!cl->LoadFromFile(filename.c_str(), CheatList::Format::Autodetect))
{
Host::AddFormattedOSDMessage(15.0f, TRANSLATE("OSDMessage", "Failed to load cheats from '%s'."), filename);
Host::AddFormattedOSDMessage(15.0f, TRANSLATE("OSDMessage", "Failed to load cheats from '%s'."), filename.c_str());
return false;
}
@ -4558,19 +4571,6 @@ bool System::LoadCheatList(const char* filename)
return true;
}
bool System::LoadCheatListFromGameTitle()
{
// Called when booting, needs to test for shutdown.
if (IsShutdown() || Achievements::IsHardcoreModeActive())
return false;
const std::string filename(GetCheatFileName());
if (filename.empty() || !FileSystem::FileExists(filename.c_str()))
return false;
return LoadCheatList(filename.c_str());
}
bool System::LoadCheatListFromDatabase()
{
if (IsShutdown() || s_running_game_serial.empty() || Achievements::IsHardcoreModeActive())
@ -4650,7 +4650,7 @@ void System::ClearCheatList(bool save_to_file)
SaveCheatList();
}
void System::SetCheatCodeState(u32 index, bool enabled, bool save_to_file)
void System::SetCheatCodeState(u32 index, bool enabled)
{
if (!System::IsValid() || !System::HasCheatList())
return;
@ -4676,8 +4676,7 @@ void System::SetCheatCodeState(u32 index, bool enabled, bool save_to_file)
Host::AddFormattedOSDMessage(5.0f, TRANSLATE("OSDMessage", "Cheat '%s' disabled."), cc.description.c_str());
}
if (save_to_file)
SaveCheatList();
SaveCheatList();
}
void System::ApplyCheatCode(u32 index)