summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
diff options
context:
space:
mode:
authorRachel Bryk <RachelBryk@gmail.com>2014-08-11 13:43:26 -0400
committerRachel Bryk <RachelBryk@gmail.com>2014-09-03 03:08:09 -0400
commit5adbc83453d14b23818442f545ceede0e4548196 (patch)
treebdc853c8e073ad09189a8f2811306105d061fbec /Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
parent64575d565a47e582715aac003d8a0c55cc4ac2ca (diff)
Change ControlState typedef to double, and change all related floats/doubles to use it.
Fixes an off by 1 issue related to double->float->double conversion, and eliminates numerous warnings.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
index c43cd255e8..b745f7b2d4 100644
--- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
@@ -407,7 +407,7 @@ ControlState Joystick::Button::GetState() const
ControlState Joystick::Axis::GetState() const
{
- return std::max(0.0f, ControlState(SDL_JoystickGetAxis(m_js, m_index)) / m_range);
+ return std::max(0.0, ControlState(SDL_JoystickGetAxis(m_js, m_index)) / m_range);
}
ControlState Joystick::Hat::GetState() const