Fix UpdateBonePosition() breaking animations (#9577)

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

diff --git a/src/client/joystick_controller.cpp b/src/client/joystick_controller.cpp
index cb9d64b9fa6c7ddc47b4a45e24ac1991a3e06e37..c29e8b639858e81f3d1ba2bcf1e17c648f70a201 100644 (file)
--- a/src/client/joystick_controller.cpp
+++ b/src/client/joystick_controller.cpp
@@ -22,7 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "keys.h"
 #include "settings.h"
 #include "gettime.h"
-#include "../util/string.h"
+#include "porting.h"
+#include "util/string.h"
 
 bool JoystickButtonCmb::isTriggered(const irr::SEvent::SJoystickEvent &ev) const
 {
@@ -40,8 +41,8 @@ bool JoystickAxisCmb::isTriggered(const irr::SEvent::SJoystickEvent &ev) const
 }
 
 // spares many characters
-#define JLO_B_PB(A, B, C)    jlo.button_keys.push_back(JoystickButtonCmb(A, B, C))
-#define JLO_A_PB(A, B, C, D) jlo.axis_keys.push_back(JoystickAxisCmb(A, B, C, D))
+#define JLO_B_PB(A, B, C)    jlo.button_keys.emplace_back(A, B, C)
+#define JLO_A_PB(A, B, C, D) jlo.axis_keys.emplace_back(A, B, C, D)
 
 JoystickLayout create_default_layout()
 {
@@ -153,14 +154,11 @@ JoystickLayout create_xbox_layout()
        return jlo;
 }
 
-JoystickController::JoystickController()
+JoystickController::JoystickController() :
+               doubling_dtime(g_settings->getFloat("repeat_joystick_button_time"))
 {
-       m_joystick_id = 0;
-
-       doubling_dtime = g_settings->getFloat("repeat_joystick_button_time");
-
-       for (size_t i = 0; i < KeyType::INTERNAL_ENUM_COUNT; i++) {
-               m_past_pressed_time[i] = 0;
+       for (float &i : m_past_pressed_time) {
+               i = 0;
        }
        clear();
 }
@@ -199,21 +197,21 @@ bool JoystickController::handleEvent(const irr::SEvent::SJoystickEvent &ev)
        if (ev.Joystick != m_joystick_id)
                return false;
 
-       m_internal_time = getTimeMs() / 1000.f;
+       m_internal_time = porting::getTimeMs() / 1000.f;
 
        std::bitset<KeyType::INTERNAL_ENUM_COUNT> keys_pressed;
 
        // First generate a list of keys pressed
 
-       for (size_t i = 0; i < m_layout.button_keys.size(); i++) {
-               if (m_layout.button_keys[i].isTriggered(ev)) {
-                       keys_pressed.set(m_layout.button_keys[i].key);
+       for (const auto &button_key : m_layout.button_keys) {
+               if (button_key.isTriggered(ev)) {
+                       keys_pressed.set(button_key.key);
                }
        }
 
-       for (size_t i = 0; i < m_layout.axis_keys.size(); i++) {
-               if (m_layout.axis_keys[i].isTriggered(ev)) {
-                       keys_pressed.set(m_layout.axis_keys[i].key);
+       for (const auto &axis_key : m_layout.axis_keys) {
+               if (axis_key.isTriggered(ev)) {
+                       keys_pressed.set(axis_key.key);
                }
        }