diff options
| author | JMC47 <JMC4789@gmail.com> | 2019-03-13 19:00:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 19:00:24 -0400 |
| commit | 011ecd92e8e2b0b78471cc7ad394b6ed1f7a451e (patch) | |
| tree | ee12d70ff3889b093c2696715eace0952aee8ccb /Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp | |
| parent | bc9e9caf19749778d01b9721a1ff92acccf70fac (diff) | |
| parent | c389d68186ea7fa95d763d7bb55bc09e5a45c4cd (diff) | |
Merge pull request #7829 from jordan-woyak/detect-input-improve
ControllerInterface/DolphinQt: Improve input detection.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp index 0b5cbad358..8c518335a0 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp @@ -228,7 +228,7 @@ ControlState Device::Trigger::GetState() const ControlState Device::Axis::GetState() const { - return std::max(0.0, ControlState(m_axis) / m_range); + return ControlState(m_axis) / m_range; } void Device::Motor::SetState(ControlState state) @@ -236,5 +236,5 @@ void Device::Motor::SetState(ControlState state) m_motor = (WORD)(state * m_range); m_parent->UpdateMotors(); } -} -} +} // namespace XInput +} // namespace ciface |