summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2019-02-26 19:46:21 -0600
committerJordan Woyak <jordan.woyak@gmail.com>2019-03-03 18:36:16 -0600
commit48b69ca01841ba724049895a83d8d88ec95d66de (patch)
tree43fda39dfdccc0999afdb0aaa4e2ab1fd5874c39 /Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp
parent13b2b93d3d12e4c8491ed82c63d52a24a4849476 (diff)
ControllerInterface: Input detection improvements.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp6
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