Merge pull request #2018 from JosJuice/gameini-region-wildcard

Support game INIs that match all regions
This commit is contained in:
Markus Wick
2015-02-21 15:47:57 +01:00
1342 changed files with 3609 additions and 24289 deletions

View File

@ -96,16 +96,7 @@ bool BootCore(const std::string& _rFilename)
return false;
// Load game specific settings
std::string unique_id = StartUp.GetUniqueID();
std::string revision_specific = StartUp.m_strRevisionSpecificUniqueID;
StartUp.m_strGameIniDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + unique_id + ".ini";
if (revision_specific != "")
StartUp.m_strGameIniDefaultRevisionSpecific = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + revision_specific + ".ini";
else
StartUp.m_strGameIniDefaultRevisionSpecific = "";
StartUp.m_strGameIniLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + unique_id + ".ini";
if (unique_id.size() == 6)
if (StartUp.GetUniqueID().size() == 6)
{
IniFile game_ini = StartUp.LoadGameIni();