diff options
| author | Markus Wick <markus+github@selfnet.de> | 2015-02-21 15:47:57 +0100 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2015-02-21 15:47:57 +0100 |
| commit | 95c48b2be70c4a6a2f7a187d74f72103d21850dc (patch) | |
| tree | 8bac905973cc46316e0166be885b4a68a4980096 /Source/Core/InputCommon/InputConfig.cpp | |
| parent | 6bbf77450714df5fa2a379e20e483905ce8f3889 (diff) | |
| parent | b85a4ced9fd34b4220f25c1cf9cf3758f19e405a (diff) | |
Merge pull request #2018 from JosJuice/gameini-region-wildcard
Support game INIs that match all regions
Diffstat (limited to 'Source/Core/InputCommon/InputConfig.cpp')
| -rw-r--r-- | Source/Core/InputCommon/InputConfig.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index 5920b39b99..da5bb5081a 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -17,7 +17,6 @@ InputConfig::~InputConfig() bool InputConfig::LoadConfig(bool isGC) { IniFile inifile; - IniFile game_ini; bool useProfile[MAX_BBMOTES] = {false, false, false, false, false}; std::string num[MAX_BBMOTES] = {"1", "2", "3", "4", "BB"}; std::string profile[MAX_BBMOTES]; @@ -37,8 +36,7 @@ bool InputConfig::LoadConfig(bool isGC) path = "Profiles/Wiimote/"; } - game_ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini"); - game_ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini", true); + IniFile game_ini = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadGameIni(); IniFile::Section* control_section = game_ini.GetOrCreateSection("Controls"); for (int i = 0; i < 4; i++) @@ -53,7 +51,7 @@ bool InputConfig::LoadConfig(bool isGC) } else { - // TODO: Having a PanicAlert for this is dumb. + // TODO: PanicAlert shouldn't be used for this. PanicAlertT("Selected controller profile does not exist"); } } |