diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-06-12 12:57:28 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-06-12 12:57:28 +0000 |
| commit | a82adcd5d36a61abcf06d3b7de335002c4f0bea4 (patch) | |
| tree | a1d9a59fc33252b9fc926424a6258170f4916c78 /Source/Core/InputCommon/Src/ControllerInterface | |
| parent | ce3c2700e7fd4226905b2ed652aded96d44eebd2 (diff) | |
Made GCPadNew load the same defaults as old GCPad if GCPadNew.ini doesn't exist. (haven't tested Linux/OS X)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5654 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputJoystick.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp index 35b006a211..78a4d81244 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp @@ -33,12 +33,12 @@ void ControllerInterface::Init() if ( m_is_init ) return; -#ifdef CIFACE_USE_XINPUT - ciface::XInput::Init( m_devices ); -#endif #ifdef CIFACE_USE_DIRECTINPUT ciface::DirectInput::Init( m_devices/*, (HWND)m_hwnd*/ ); #endif +#ifdef CIFACE_USE_XINPUT + ciface::XInput::Init( m_devices ); +#endif #ifdef CIFACE_USE_XLIB ciface::Xlib::Init( m_devices, m_hwnd ); #endif diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputJoystick.cpp index da93185e67..756b94edda 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputJoystick.cpp @@ -454,8 +454,7 @@ GETDEVDATA : if (DIERR_INPUTLOST == hr || DIERR_NOTACQUIRED == hr) hr = m_device->Acquire(); - return true; - //return SUCCEEDED(hr); + return SUCCEEDED(hr); } bool Joystick::UpdateOutput() |