diff options
| author | JosJuice <josjuice@gmail.com> | 2015-02-07 21:27:26 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2015-02-11 19:01:05 +0100 |
| commit | f9d6c17c08f0aca5ac9f72432e5de780d50bafdf (patch) | |
| tree | 214e5da24ad8eecbc7fb93397f5a42827b08710f /Source/Core/InputCommon/InputConfig.cpp | |
| parent | e186104960ce11bb52b30cebfb8ab08d036c8816 (diff) | |
Use CoreParameter's game INI functions in more places
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"); } } |