Merge pull request #1278 from lioncash/controller

ControllerInterface: Get rid of SetHwnd(), introduce Reinitialize()
This commit is contained in:
skidau committed 2014-10-16 14:02:56 +11:00
commit f27aabd411
5 files changed
+21 -24

No files matched your search

+1 -2
View File
@@ -40,8 +40,7 @@ void Initialize(void* const hwnd)
for (unsigned int i=0; i<4; ++i)
s_config.controllers.push_back(new GCPad(i));
g_controller_interface.SetHwnd(hwnd);
g_controller_interface.Initialize();
g_controller_interface.Initialize(hwnd);
// load the saved controller config
s_config.LoadConfig(true);
+1 -3
View File
@@ -44,9 +44,7 @@ void Initialize(void* const hwnd, bool wait)
for (unsigned int i = WIIMOTE_CHAN_0; i<MAX_BBMOTES; ++i)
s_config.controllers.push_back(new WiimoteEmu::Wiimote(i));
g_controller_interface.SetHwnd(hwnd);
g_controller_interface.Initialize();
g_controller_interface.Initialize(hwnd);
s_config.LoadConfig(false);