From aae0fa79098382bc44d2b5241783cca60d60188a Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 3 Oct 2010 04:29:34 +0000 Subject: InputCommon(GCPad/WiimoteNew): Fixed issue when inifile didn't exist, defaults were loaded, and input didn't work. Fixed prob in DirectInput(hopefully doesn't break any other gamepads): buffered data wasn't ever being used. WiimoteNew: Hopefully made emulated swinging better(please comment). Added (completely untested) incomplete emulated turntable(DJ Hero) extension support :p. Deleted some files that I meant to delete in my last commit. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6250 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputCommon/Src/InputConfig.cpp | 30 +++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'Source/Core/InputCommon/Src/InputConfig.cpp') diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp index a160349ac6..73d52aae84 100644 --- a/Source/Core/InputCommon/Src/InputConfig.cpp +++ b/Source/Core/InputCommon/Src/InputConfig.cpp @@ -42,24 +42,26 @@ InputPlugin::~InputPlugin() bool InputPlugin::LoadConfig() { IniFile inifile; - if (false == inifile.Load(std::string(File::GetUserPath(D_CONFIG_IDX)) + ini_name + ".ini")) + if (inifile.Load(std::string(File::GetUserPath(D_CONFIG_IDX)) + ini_name + ".ini")) { - controllers[0]->LoadDefaults(controller_interface); - return false; + std::vector< ControllerEmu* >::const_iterator + i = controllers.begin(), + e = controllers.end(); + for (; i!=e; ++i) + { + // load settings from ini + (*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str())); + // update refs + (*i)->UpdateReferences(controller_interface); + } + return true; } - - std::vector< ControllerEmu* >::const_iterator - i = controllers.begin(), - e = controllers.end(); - for ( ; i!=e; ++i ) + else { - // load settings from ini - (*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str())); - // update refs - (*i)->UpdateReferences(controller_interface); + controllers[0]->LoadDefaults(controller_interface); + controllers[0]->UpdateReferences(controller_interface); + return false; } - - return true; } void InputPlugin::SaveConfig() -- cgit v1.2.3