diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-01-17 15:48:50 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-01-17 15:48:50 -0600 |
| commit | a01bd96d7d0bde0125ad3b13a6e6f6353fe1c8a0 (patch) | |
| tree | bfea2306c8379113f675ab920357f459db934ac2 /Source/Core/InputCommon/Src/ControllerInterface/DInput | |
| parent | 69c91a20ea77bad0a9a1e10ab963c580908c3a45 (diff) | |
| parent | f97d2a93c4167a4b6aec0ae69536395380d427e3 (diff) | |
Merge branch 'full-analog-surface'
Fixes issue 5010.
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/DInput')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp index af6ee7e77c..9bc5364e76 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp @@ -267,8 +267,8 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI const LONG& ax = (&m_state_in.lX)[offset]; // each axis gets a negative and a positive input instance associated with it - AddInput(new Axis(offset, ax, base, range.lMin-base)); - AddInput(new Axis(offset, ax, base, range.lMax-base)); + AddAnalogInputs(new Axis(offset, ax, base, range.lMin-base), + new Axis(offset, ax, base, range.lMax-base)); } } |