diff options
| author | ayuanx <ayuanx@gmail.com> | 2010-01-23 12:36:30 +0000 |
|---|---|---|
| committer | ayuanx <ayuanx@gmail.com> | 2010-01-23 12:36:30 +0000 |
| commit | 1ecbcb39ea09f2114eecb2c5451964cdbd969118 (patch) | |
| tree | 915be517011e089f48f622e2f6f4fa2daf4edb42 /Source/Core/InputCommon | |
| parent | 2098271bc8a72b4b1b9d65bfe47bbf0921b228cb (diff) | |
Added support for X360pad rumble
Need someone who has a X360pad to test.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4929 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/Src/XInput.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/Src/XInput.cpp b/Source/Core/InputCommon/Src/XInput.cpp index 267bf4e714..3ba09c3aa2 100644 --- a/Source/Core/InputCommon/Src/XInput.cpp +++ b/Source/Core/InputCommon/Src/XInput.cpp @@ -97,17 +97,17 @@ int GetXI(int Controller, int Button) { // Update the internal status DWORD dwResult; - dwResult = XInputGetState( Controller, &g_Controllers[Controller].state ); + dwResult = XInputGetState(Controller, &g_Controllers[Controller].state); - if( dwResult != ERROR_SUCCESS ) return -1; + if (dwResult != ERROR_SUCCESS) return -1; - switch(Button) + switch (Button) { case InputCommon::XI_TRIGGER_L: - return g_Controllers[0].state.Gamepad.bLeftTrigger; + return g_Controllers[Controller].state.Gamepad.bLeftTrigger; case InputCommon::XI_TRIGGER_R: - return g_Controllers[0].state.Gamepad.bRightTrigger; + return g_Controllers[Controller].state.Gamepad.bRightTrigger; default: return 0; |