mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 12:48:57 +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

6
Source/Core/Core/PatchEngine.cpp
View file

@ -161,9 +161,9 @@ int GetSpeedhackCycles(const u32 addr)
void LoadPatches()
{
IniFile merged = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadGameIni();
IniFile globalIni = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadDefaultGameIni();
IniFile localIni = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadLocalGameIni();
IniFile merged = SConfig::GetInstance().LoadGameIni();
IniFile globalIni = SConfig::GetInstance().LoadDefaultGameIni();
IniFile localIni = SConfig::GetInstance().LoadLocalGameIni();
LoadPatchSection("OnFrame", onFrame, globalIni, localIni);
ActionReplay::LoadCodes(globalIni, localIni, false);