summaryrefslogtreecommitdiff
path: root/src/client/joystick_controller.cpp
diff options
context:
space:
mode:
authorWuzzy <wuzzy2@mail.ru>2021-02-24 10:45:30 +0000
committerGitHub <noreply@github.com>2021-02-24 11:45:30 +0100
commit827224635bc131dbf4f6e41dd3d78c7a2d94da0f (patch)
tree57963040d80122de7934707e3626c8d65f88ce18 /src/client/joystick_controller.cpp
parent02d64a51ee185722ec1b6e2941b461bacf0db0de (diff)
downloadminetest-827224635bc131dbf4f6e41dd3d78c7a2d94da0f.tar.gz
minetest-827224635bc131dbf4f6e41dd3d78c7a2d94da0f.tar.bz2
minetest-827224635bc131dbf4f6e41dd3d78c7a2d94da0f.zip
Use "Aux1" key name consistently everywhere
Diffstat (limited to 'src/client/joystick_controller.cpp')
-rw-r--r--src/client/joystick_controller.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/joystick_controller.cpp b/src/client/joystick_controller.cpp
index f61ae4ae6..919db5315 100644
--- a/src/client/joystick_controller.cpp
+++ b/src/client/joystick_controller.cpp
@@ -79,7 +79,7 @@ JoystickLayout create_default_layout()
// Accessible without any modifier pressed
JLO_B_PB(KeyType::JUMP, bm | 1 << 0, 1 << 0);
- JLO_B_PB(KeyType::SPECIAL1, bm | 1 << 1, 1 << 1);
+ JLO_B_PB(KeyType::AUX1, bm | 1 << 1, 1 << 1);
// Accessible with start button not pressed, but four pressed
// TODO find usage for button 0
@@ -126,11 +126,11 @@ JoystickLayout create_xbox_layout()
// 4 Buttons
JLO_B_PB(KeyType::JUMP, 1 << 0, 1 << 0); // A/green
JLO_B_PB(KeyType::ESC, 1 << 1, 1 << 1); // B/red
- JLO_B_PB(KeyType::SPECIAL1, 1 << 2, 1 << 2); // X/blue
+ JLO_B_PB(KeyType::AUX1, 1 << 2, 1 << 2); // X/blue
JLO_B_PB(KeyType::INVENTORY, 1 << 3, 1 << 3); // Y/yellow
// Analog Sticks
- JLO_B_PB(KeyType::SPECIAL1, 1 << 11, 1 << 11); // left
+ JLO_B_PB(KeyType::AUX1, 1 << 11, 1 << 11); // left
JLO_B_PB(KeyType::SNEAK, 1 << 12, 1 << 12); // right
// Triggers