summaryrefslogtreecommitdiff
path: root/src/client/joystick_controller.cpp
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-08-15 20:30:30 +0200
committerGitHub <noreply@github.com>2017-08-15 20:30:30 +0200
commit9dd0f952e09471f15f59a98c1ae650d99499cd77 (patch)
treeef600d29b8b753353657ac6740d47208dd0e5d09 /src/client/joystick_controller.cpp
parent64c7a689ad8a596f6b72afe200d9ced20cdd9630 (diff)
downloadminetest-9dd0f952e09471f15f59a98c1ae650d99499cd77.tar.gz
minetest-9dd0f952e09471f15f59a98c1ae650d99499cd77.tar.bz2
minetest-9dd0f952e09471f15f59a98c1ae650d99499cd77.zip
Modernize client code (#6250)
* Various code style fixes * Use range based for loops * Use empty instead of empty objects * Use C++11 default keyword for trivial constructors and destructors * Drop some useless casts * Use emplace_back instead of push_back to improve performance of some vectors push
Diffstat (limited to 'src/client/joystick_controller.cpp')
-rw-r--r--src/client/joystick_controller.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/client/joystick_controller.cpp b/src/client/joystick_controller.cpp
index 5a3d35d7c..95bd77bc4 100644
--- a/src/client/joystick_controller.cpp
+++ b/src/client/joystick_controller.cpp
@@ -41,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()
{
@@ -157,8 +157,8 @@ JoystickLayout create_xbox_layout()
JoystickController::JoystickController() :
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();
}
@@ -203,15 +203,15 @@ bool JoystickController::handleEvent(const irr::SEvent::SJoystickEvent &ev)
// 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);
}
}