Fix some more joystick issues (#10624)

[dragonfireclient.git] / src / client / joystick_controller.h

diff --git a/src/client/joystick_controller.h b/src/client/joystick_controller.h
index 7baacd81b0a57a3b2d46b4078c87e4bbef826dfa..3f361e4ef66e469a53efd2beee6e65f3d28cec19 100644 (file)
--- a/src/client/joystick_controller.h
+++ b/src/client/joystick_controller.h
@@ -96,7 +96,7 @@ struct JoystickLayout {
        std::vector<JoystickButtonCmb> button_keys;
        std::vector<JoystickAxisCmb> axis_keys;
        JoystickAxisLayout axes[JA_COUNT];
-       s16 axes_dead_border;
+       s16 axes_deadzone;
 };
 
 class JoystickController {
@@ -111,37 +111,32 @@ class JoystickController {
 
        bool wasKeyDown(GameKeyType b)
        {
-               bool r = m_past_pressed_keys[b];
-               m_past_pressed_keys[b] = false;
+               bool r = m_past_keys_pressed[b];
+               m_past_keys_pressed[b] = false;
                return r;
        }
-       bool getWasKeyDown(GameKeyType b)
+
+       bool wasKeyReleased(GameKeyType b)
        {
-               return m_past_pressed_keys[b];
+               return m_keys_released[b];
        }
-       void clearWasKeyDown(GameKeyType b)
+       void clearWasKeyReleased(GameKeyType b)
        {
-               m_past_pressed_keys[b] = false;
+               m_keys_released[b] = false;
        }
 
-       bool wasKeyReleased(GameKeyType b)
+       bool wasKeyPressed(GameKeyType b)
        {
-               bool r = m_past_released_keys[b];
-               m_past_released_keys[b] = false;
-               return r;
-       }
-       bool getWasKeyReleased(GameKeyType b)
-       {
-               return m_past_pressed_keys[b];
+               return m_keys_pressed[b];
        }
-       void clearWasKeyReleased(GameKeyType b)
+       void clearWasKeyPressed(GameKeyType b)
        {
-               m_past_pressed_keys[b] = false;
+               m_keys_pressed[b] = false;
        }
 
        bool isKeyDown(GameKeyType b)
        {
-               return m_pressed_keys[b];
+               return m_keys_down[b];
        }
 
        s16 getAxis(JoystickAxis axis)
@@ -162,12 +157,13 @@ class JoystickController {
 
        u8 m_joystick_id = 0;
 
-       std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_pressed_keys;
+       std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_keys_down;
+       std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_keys_pressed;
 
        f32 m_internal_time;
 
        f32 m_past_pressed_time[KeyType::INTERNAL_ENUM_COUNT];
 
-       std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_pressed_keys;
-       std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_released_keys;
+       std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_keys_pressed;
+       std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_keys_released;
 };