summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2010-06-12 02:08:01 +0000
committerJordan Woyak <jordan.woyak@gmail.com>2010-06-12 02:08:01 +0000
commitff5081942ad26557a5c6eddfb44d19fd99964ad5 (patch)
treeb02cdc5d80feaca47287d44b0263b7c739793fb3 /Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp
parentd937b73d9c3bc6919ebdcbf40065fbb5309d2dd9 (diff)
New GCPad/Wiimote: Hopefully fixed lock up issues with DirectInput devices. Wiimote tilt should work with keyboard keys/gamepad buttons now as well as IR Forward/Backward(which was added). Made input detection buttons display "[ waiting ]" while waiting for input. minor fixes/cleanups.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5651 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp')
-rw-r--r--Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp
index 2334db121c..b1f4bb067a 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInput.cpp
@@ -15,7 +15,7 @@ namespace DirectInput
void Init( std::vector<ControllerInterface::Device*>& devices/*, HWND hwnd*/ )
{
IDirectInput8* idi8;
- if ( DI_OK != DirectInput8Create( GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (LPVOID*)&idi8, NULL ) )
+ if (FAILED(DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (LPVOID*)&idi8, NULL)))
return;
#ifdef CIFACE_USE_DIRECTINPUT_KBM