feedc0de/dolphin
1
0
Fork 0
forked from dolphin-emu/dolphin
Code Pull Requests Activity

Move some BootManager game INI code to CoreParameter

Browse Source
This commit is contained in:
JosJuice
2015-02-06 19:28:43 +01:00
parent 451c4f3c4b
commit d73a6ea3b7
4 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Core/Core/CoreParameter.cpp
View File

@@ -375,28 +375,36 @@ void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::stri
}
}
IniFile SCoreStartupParameter::LoadGameIni() const
{
IniFile game_ini;
game_ini.Load(m_strGameIniDefault);
if (m_strGameIniDefaultRevisionSpecific != "")
game_ini.Load(m_strGameIniDefaultRevisionSpecific, true);
game_ini.Load(m_strGameIniLocal, true);
return game_ini;
}
IniFile SCoreStartupParameter::LoadDefaultGameIni() const
{
IniFile game_ini;
game_ini.Load(m_strGameIniDefault);
if (m_strGameIniDefaultRevisionSpecific != "")
game_ini.Load(m_strGameIniDefaultRevisionSpecific, true);
LoadDefaultGameIni(&game_ini);
return game_ini;
}
IniFile SCoreStartupParameter::LoadLocalGameIni() const
{
IniFile game_ini;
game_ini.Load(m_strGameIniLocal);
LoadLocalGameIni(&game_ini);
return game_ini;
}
IniFile SCoreStartupParameter::LoadGameIni() const
{
IniFile game_ini;
LoadDefaultGameIni(&game_ini);
LoadLocalGameIni(&game_ini);
return game_ini;
}
void SCoreStartupParameter::LoadDefaultGameIni(IniFile* game_ini) const
{
game_ini->Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + GetUniqueID() + ".ini", true);
if (!m_strRevisionSpecificUniqueID.empty())
game_ini->Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + m_strRevisionSpecificUniqueID + ".ini", true);
}
void SCoreStartupParameter::LoadLocalGameIni(IniFile* game_ini) const
{
game_ini->Load(File::GetUserPath(D_GAMESETTINGS_IDX) + GetUniqueID() + ".ini", true);
}