diff options
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 18 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index efb2301956..13ace15997 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -168,15 +168,15 @@ KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboar // Mouse Buttons for (int i = 0; i < 5; i++) - AddInput(new Button(i, m_state.buttons)); + AddInput(new Button(i, &m_state.buttons)); // Mouse Cursor, X-/+ and Y-/+ for (int i = 0; i != 4; ++i) - AddInput(new Cursor(!!(i & 2), !!(i & 1), (&m_state.cursor.x)[!!(i & 2)])); + AddInput(new Cursor(!!(i & 2), !!(i & 1), (i & 2) ? &m_state.cursor.y : &m_state.cursor.x)); // Mouse Axis, X-/+ and Y-/+ for (int i = 0; i != 4; ++i) - AddInput(new Axis(!!(i & 2), !!(i & 1), (&m_state.axis.x)[!!(i & 2)])); + AddInput(new Axis(!!(i & 2), !!(i & 1), (i & 2) ? &m_state.axis.y : &m_state.axis.x)); } KeyboardMouse::~KeyboardMouse() @@ -338,7 +338,7 @@ ControlState KeyboardMouse::Key::GetState() const return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0; } -KeyboardMouse::Button::Button(unsigned int index, unsigned int& buttons) +KeyboardMouse::Button::Button(unsigned int index, unsigned int* buttons) : m_buttons(buttons), m_index(index) { // this will be a problem if we remove the hardcoded five-button limit @@ -347,10 +347,10 @@ KeyboardMouse::Button::Button(unsigned int index, unsigned int& buttons) ControlState KeyboardMouse::Button::GetState() const { - return ((m_buttons & (1 << m_index)) != 0); + return ((*m_buttons & (1 << m_index)) != 0); } -KeyboardMouse::Cursor::Cursor(u8 index, bool positive, const float& cursor) +KeyboardMouse::Cursor::Cursor(u8 index, bool positive, const float* cursor) : m_cursor(cursor), m_index(index), m_positive(positive) { name = std::string("Cursor ") + (char)('X' + m_index) + (m_positive ? '+' : '-'); @@ -358,10 +358,10 @@ KeyboardMouse::Cursor::Cursor(u8 index, bool positive, const float& cursor) ControlState KeyboardMouse::Cursor::GetState() const { - return std::max(0.0f, m_cursor / (m_positive ? 1.0f : -1.0f)); + return std::max(0.0f, *m_cursor / (m_positive ? 1.0f : -1.0f)); } -KeyboardMouse::Axis::Axis(u8 index, bool positive, const float& axis) +KeyboardMouse::Axis::Axis(u8 index, bool positive, const float* axis) : m_axis(axis), m_index(index), m_positive(positive) { name = std::string("Axis ") + (char)('X' + m_index) + (m_positive ? '+' : '-'); @@ -369,7 +369,7 @@ KeyboardMouse::Axis::Axis(u8 index, bool positive, const float& axis) ControlState KeyboardMouse::Axis::GetState() const { - return std::max(0.0f, m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY)); + return std::max(0.0f, *m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY)); } } diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h index 167f9af113..a75c74bba5 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -54,11 +54,11 @@ private: { public: std::string GetName() const override { return name; } - Button(unsigned int index, unsigned int& buttons); + Button(unsigned int index, unsigned int* buttons); ControlState GetState() const override; private: - const unsigned int& m_buttons; + const unsigned int* m_buttons; const unsigned int m_index; std::string name; }; @@ -68,11 +68,11 @@ private: public: std::string GetName() const override { return name; } bool IsDetectable() override { return false; } - Cursor(u8 index, bool positive, const float& cursor); + Cursor(u8 index, bool positive, const float* cursor); ControlState GetState() const override; private: - const float& m_cursor; + const float* m_cursor; const u8 m_index; const bool m_positive; std::string name; @@ -83,11 +83,11 @@ private: public: std::string GetName() const override { return name; } bool IsDetectable() override { return false; } - Axis(u8 index, bool positive, const float& axis); + Axis(u8 index, bool positive, const float* axis); ControlState GetState() const override; private: - const float& m_axis; + const float* m_axis; const u8 m_index; const bool m_positive; std::string name; |