diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-06-22 17:21:45 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-06-22 17:21:45 +0200 |
| commit | 5dff5773398fab79ca60a0fad4aa90abf683d366 (patch) | |
| tree | 466db879b91b173e783dc4c524ad237d37c60f4d /Source/Core/InputCommon/InputConfig.cpp | |
| parent | 86d64553910c438031e2e8359f871d31f1caa12b (diff) | |
| parent | f05d3f6e5d6da8be530c0cd4ffaaec0382240ec5 (diff) | |
Merge pull request #500 from lioncash/ini
Use only section-based ini reading.
Diffstat (limited to 'Source/Core/InputCommon/InputConfig.cpp')
| -rw-r--r-- | Source/Core/InputCommon/InputConfig.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index 859036c69e..b2f972fecb 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -36,16 +36,21 @@ bool InputPlugin::LoadConfig(bool isGC) type = "Wiimote"; 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::Section* control_section = game_ini.GetOrCreateSection("Controls"); + for (int i = 0; i < 4; i++) { - if (game_ini.Exists("Controls", type + "Profile" + num[i])) + if (control_section->Exists(type + "Profile" + num[i])) { - if (game_ini.Get("Controls", type + "Profile" + num[i], &profile[i])) + if (control_section->Get(type + "Profile" + num[i], &profile[i])) { if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + path + profile[i] + ".ini")) + { useProfile[i] = true; + } else { // TODO: Having a PanicAlert for this is dumb. |