From a1f0f60a797d1fe6677d94bbeff74a48ceecb2a9 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Tue, 24 Feb 2015 17:41:39 +0100
Subject: [PATCH] CoreParameter: Refactor game INI code

---
 Source/Core/Core/CoreParameter.cpp | 39 +++++++++++++++---------------
 Source/Core/Core/CoreParameter.h   |  3 +--
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp
index 7f418cbd3a..5b4937657f 100644
--- a/Source/Core/Core/CoreParameter.cpp
+++ b/Source/Core/Core/CoreParameter.cpp
@@ -375,58 +375,59 @@ void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::stri
 
 IniFile SCoreStartupParameter::LoadDefaultGameIni() const
 {
-	IniFile game_ini;
-	LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP, GetUniqueID(), m_revision);
-	return game_ini;
+	return LoadDefaultGameIni(GetUniqueID(), m_revision);
 }
 
 IniFile SCoreStartupParameter::LoadLocalGameIni() const
 {
-	IniFile game_ini;
-	LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX), GetUniqueID(), m_revision);
-	return game_ini;
+	return LoadLocalGameIni(GetUniqueID(), m_revision);
 }
 
 IniFile SCoreStartupParameter::LoadGameIni() const
 {
-	IniFile game_ini;
-	LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP, GetUniqueID(), m_revision);
-	LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX), GetUniqueID(), m_revision);
-	return game_ini;
+	return LoadGameIni(GetUniqueID(), m_revision);
 }
 
 IniFile SCoreStartupParameter::LoadDefaultGameIni(const std::string& id, int revision)
 {
 	IniFile game_ini;
-	LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP, id, revision);
+	for (const std::string& filename : GetGameIniFilenames(id, revision))
+		game_ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + filename, true);
 	return game_ini;
 }
 
 IniFile SCoreStartupParameter::LoadLocalGameIni(const std::string& id, int revision)
 {
 	IniFile game_ini;
-	LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX), id, revision);
+	for (const std::string& filename : GetGameIniFilenames(id, revision))
+		game_ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + filename, true);
 	return game_ini;
 }
 
 IniFile SCoreStartupParameter::LoadGameIni(const std::string& id, int revision)
 {
 	IniFile game_ini;
-	LoadGameIni(&game_ini, File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP, id, revision);
-	LoadGameIni(&game_ini, File::GetUserPath(D_GAMESETTINGS_IDX), id, revision);
+	for (const std::string& filename : GetGameIniFilenames(id, revision))
+		game_ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + filename, true);
+	for (const std::string& filename : GetGameIniFilenames(id, revision))
+		game_ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + filename, true);
 	return game_ini;
 }
 
-void SCoreStartupParameter::LoadGameIni(IniFile* game_ini, const std::string& path,
-                                        const std::string& id, int revision)
+// Returns all possible filenames in ascending order of priority
+std::vector<std::string> SCoreStartupParameter::GetGameIniFilenames(const std::string& id, int revision)
 {
+	std::vector<std::string> filenames;
+
 	// INIs that match all regions
 	if (id.size() >= 4)
-		game_ini->Load(path + id.substr(0, 3) + ".ini", true);
+		filenames.push_back(id.substr(0, 3) + ".ini");
 
 	// Regular INIs
-	game_ini->Load(path + id + ".ini", true);
+	filenames.push_back(id + ".ini");
 
 	// INIs with specific revisions
-	game_ini->Load(path + id + StringFromFormat("r%d", revision) + ".ini", true);
+	filenames.push_back(id + StringFromFormat("r%d", revision) + ".ini");
+
+	return filenames;
 }
diff --git a/Source/Core/Core/CoreParameter.h b/Source/Core/Core/CoreParameter.h
index 80ab3a628b..e5f9cac9b1 100644
--- a/Source/Core/Core/CoreParameter.h
+++ b/Source/Core/Core/CoreParameter.h
@@ -257,6 +257,5 @@ struct SCoreStartupParameter
 	static IniFile LoadLocalGameIni(const std::string& id, int revision);
 	static IniFile LoadGameIni(const std::string& id, int revision);
 
-private:
-	static void LoadGameIni(IniFile* game_ini, const std::string& path, const std::string& id, int revision);
+	static std::vector<std::string> GetGameIniFilenames(const std::string& id, int revision);
 };