diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-01-08 20:27:34 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-01-08 20:27:34 +1300 |
| commit | 0ec7ef4b9905cbeb10f523097fbff3da50ede4f1 (patch) | |
| tree | c4e8259084901e51b6d1294e6faf5e3ba1ae7152 /Source/Core/InputCommon/Src/ControllerInterface | |
| parent | 9f13e69be46b07c64bedb9b225f06fb8f738bb7e (diff) | |
| parent | 1d44d3baf5cc0702b9e042687d63c5a72fd0f6b0 (diff) | |
Merge branch 'master' into gdbstub
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp index b7ac3bf82e..af6ee7e77c 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp @@ -535,11 +535,7 @@ ControlState Joystick::Hat::GetState() const void Joystick::ForceConstant::SetState(const ControlState state) { - float force = abs(state - 0.5) * 2; - if (state < 0.5) - force = -force; - - const LONG new_val = LONG(10000 * force); + const LONG new_val = LONG(10000 * state); LONG &val = params.lMagnitude; if (val != new_val) |