From c375111076235313669e71953c877c9512cebd16 Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 12 Jun 2015 13:56:53 +0200 Subject: Options: merge SCoreStartupParameter into SConfig --- Source/Core/InputCommon/InputConfig.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/InputCommon/InputConfig.cpp') diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index d17d02d085..6456e1e68f 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -15,7 +15,7 @@ bool InputConfig::LoadConfig(bool isGC) std::string profile[MAX_BBMOTES]; std::string path; - if (SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() != "00000000") + if (SConfig::GetInstance().GetUniqueID() != "00000000") { std::string type; if (isGC) @@ -29,7 +29,7 @@ bool InputConfig::LoadConfig(bool isGC) path = "Profiles/Wiimote/"; } - IniFile game_ini = SConfig::GetInstance().m_LocalCoreStartupParameter.LoadGameIni(); + IniFile game_ini = SConfig::GetInstance().LoadGameIni(); IniFile::Section* control_section = game_ini.GetOrCreateSection("Controls"); for (int i = 0; i < 4; i++) -- cgit v1.2.3