summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2014-12-07 01:22:03 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2014-12-07 01:22:03 -0600
commitd9d0e285c94b205d3b59b55b4d0dfec9d78b2683 (patch)
tree166e75747843fc652a39cc683b4aa399c30e2c17 /Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
parent4e98078dafe0075a02c371ae463a4b933ca04d6d (diff)
parent854f6b8688063544310edbc0fc27a8c42f517d9b (diff)
Merge pull request #1560 from magcius/pad-cleanup-1
Pad cleanup 1
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
index 13ace15997..1d7d080d7e 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
@@ -208,7 +208,7 @@ void KeyboardMouse::UpdateCursor()
m_state.cursor.y = win_y / (float)win_attribs.height * 2 - 1;
}
-bool KeyboardMouse::UpdateInput()
+void KeyboardMouse::UpdateInput()
{
XFlush(m_display);
@@ -282,13 +282,6 @@ bool KeyboardMouse::UpdateInput()
m_state.axis.y *= MOUSE_AXIS_SMOOTHING;
m_state.axis.y += delta_y;
m_state.axis.y /= MOUSE_AXIS_SMOOTHING+1.0f;
-
- return true;
-}
-
-bool KeyboardMouse::UpdateOutput()
-{
- return true;
}
std::string KeyboardMouse::GetName() const