From a0aa506453195d99d8b7e1c0297bb1e285428d0c Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 10 Jul 2010 06:48:24 +0000 Subject: GCPad/Wiimote New: Added a set defaults button to the config dialog. (gave new wiimote plugin a few default buttons, not done) Moved MSWindows cursor position code to ControllerInterface/DInput (plan on moving Linux's cursor code to Xlib as well). IR Up,Down,L,R now must have Cursor X/Y/-+ mapped for regular mouse control on Windows. (hopefully this isn't too confusing, the reset to default button automatically sets this up). Renamed One,Two,Minus,Plus to 12-+ (you will have to reconfigure these buttons, sorry). Added text labels for the button and trigger preview bitmaps. -other minor stuff. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5865 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputCommon/Src/InputConfig.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (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 b4d8a3b546..a160349ac6 100644 --- a/Source/Core/InputCommon/Src/InputConfig.cpp +++ b/Source/Core/InputCommon/Src/InputConfig.cpp @@ -43,14 +43,22 @@ bool InputPlugin::LoadConfig() { IniFile inifile; if (false == 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 ) { + for ( ; i!=e; ++i ) + { + // load settings from ini (*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str())); + // update refs + (*i)->UpdateReferences(controller_interface); } + return true; } -- cgit v1.2.3