From 8670f2a627af35d864f3b7be15dafa48cc7b4f6a Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 6 Feb 2015 19:34:17 +0100 Subject: [PATCH] CoreParameter: Unify LoadDefaultGameIni and LoadLocalGameIni A side effect of this is that user INIs now can specify revisions. I don't think anyone will use it, but there's no reason to not allow it. --- Source/Core/Core/CoreParameter.cpp | 19 +++++++------------ Source/Core/Core/CoreParameter.h | 3 +-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index ff2d5b88bd..b7ac535a3f 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -378,33 +378,28 @@ void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::stri IniFile SCoreStartupParameter::LoadDefaultGameIni() const { IniFile game_ini; - LoadDefaultGameIni(&game_ini); + LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP); return game_ini; } IniFile SCoreStartupParameter::LoadLocalGameIni() const { IniFile game_ini; - LoadLocalGameIni(&game_ini); + LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX)); return game_ini; } IniFile SCoreStartupParameter::LoadGameIni() const { IniFile game_ini; - LoadDefaultGameIni(&game_ini); - LoadLocalGameIni(&game_ini); + LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP); + LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX)); return game_ini; } -void SCoreStartupParameter::LoadDefaultGameIni(IniFile* game_ini) const +void SCoreStartupParameter::LoadGameIni(IniFile* game_ini, const std::string& path) const { - game_ini->Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + GetUniqueID() + ".ini", true); + game_ini->Load(path + 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); + game_ini->Load(path + m_strRevisionSpecificUniqueID + ".ini", true); } diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h index 1546a10e18..e967b39026 100644 --- a/Source/Core/Core/CoreParameter.h +++ b/Source/Core/Core/CoreParameter.h @@ -265,6 +265,5 @@ struct SCoreStartupParameter IniFile LoadGameIni() const; private: - void LoadDefaultGameIni(IniFile* game_ini) const; - void LoadLocalGameIni(IniFile* game_ini) const; + void LoadGameIni(IniFile* game_ini, const std::string& path) const; };