mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-02 15:45:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Options: merge SCoreStartupParameter into SConfig

Browse source
This commit is contained in:
degasus 2015-06-12 13:56:53 +02:00
commit c375111076
114 changed files with 1100 additions and 1163 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/Core/Core/ActionReplay.cpp
View file

@ -105,7 +105,7 @@ struct ARAddr
void LoadCodes(const IniFile& globalIni, const IniFile& localIni, bool forceLoad)
{
// Parses the Action Replay section of a game ini file.
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats &&
if (!SConfig::GetInstance().bEnableCheats &&
!forceLoad)
return;
@ -276,8 +276,8 @@ void SetARCode_IsActive(bool active, size_t index)
void UpdateActiveList()
{
bool old_value = SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats;
SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats = false;
bool old_value = SConfig::GetInstance().bEnableCheats;
SConfig::GetInstance().bEnableCheats = false;
b_RanOnce = false;
activeCodes.clear();
for (auto& arCode : arCodes)
@ -285,7 +285,7 @@ void UpdateActiveList()
if (arCode.active)
activeCodes.push_back(arCode);
}
SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats = old_value;
SConfig::GetInstance().bEnableCheats = old_value;
}
void EnableSelfLogging(bool enable)
@ -760,7 +760,7 @@ static bool ConditionalCode(const ARAddr& addr, const u32 data, int* const pSkip
void RunAllActive()
{
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats)
if (SConfig::GetInstance().bEnableCheats)
{
for (auto& activeCode : activeCodes)
{