Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Joystick: Remap joystick-specific KeyTypes to generic ones 

According to the following table:
	* MOUSE_L     -> DIG
	* MOUSE_R     -> PLACE
	* SCROLL_UP   -> HOTBAR_NEXT
	* SCROLL_DOWN -> HOTBAR_PREV

This commit entirely removes the special KeyTypes used for joysticks.

Support for the MOUSE KeyTypes had already been removed in the main
game code without adapting the joystick code, breaking joystick
input. This commit restores joystick functionality.
master
Markus Koch 2020-11-07 17:45:32 +01:00 committed by sfan5
parent 7589cbe086
commit e1142ee57f
3 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/game.cpp
View File

@ -2014,15 +2014,11 @@ void Game::processItemSelection(u16 *new_playeritem)
s32 dir = wheel; s32 dir = wheel;
if (input->joystick.wasKeyDown(KeyType::SCROLL_DOWN) || if (wasKeyDown(KeyType::HOTBAR_NEXT))
wasKeyDown(KeyType::HOTBAR_NEXT)) {
dir = -1; dir = -1;
}
if (input->joystick.wasKeyDown(KeyType::SCROLL_UP) || if (wasKeyDown(KeyType::HOTBAR_PREV))
wasKeyDown(KeyType::HOTBAR_PREV)) {
dir = 1; dir = 1;
}
if (dir < 0) if (dir < 0)
*new_playeritem = *new_playeritem < max_item ? *new_playeritem + 1 : 0; *new_playeritem = *new_playeritem < max_item ? *new_playeritem + 1 : 0;
@ -3138,11 +3134,11 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug)
input->clearWasKeyPressed(); input->clearWasKeyPressed();
input->clearWasKeyReleased(); input->clearWasKeyReleased();
input->joystick.clearWasKeyDown(KeyType::MOUSE_L); input->joystick.clearWasKeyDown(KeyType::DIG);
input->joystick.clearWasKeyDown(KeyType::MOUSE_R); input->joystick.clearWasKeyDown(KeyType::PLACE);
input->joystick.clearWasKeyReleased(KeyType::MOUSE_L); input->joystick.clearWasKeyReleased(KeyType::DIG);
input->joystick.clearWasKeyReleased(KeyType::MOUSE_R); input->joystick.clearWasKeyReleased(KeyType::PLACE);
} }

20
src/client/joystick_controller.cpp
View File

@ -74,8 +74,8 @@ JoystickLayout create_default_layout()
// Accessible without four modifier button pressed // Accessible without four modifier button pressed
// regardless whether start is pressed or not // regardless whether start is pressed or not
JLO_B_PB(KeyType::MOUSE_L, fb | 1 << 4, 1 << 4); JLO_B_PB(KeyType::DIG, fb | 1 << 4, 1 << 4);
JLO_B_PB(KeyType::MOUSE_R, fb | 1 << 5, 1 << 5); JLO_B_PB(KeyType::PLACE, fb | 1 << 5, 1 << 5);
// Accessible without any modifier pressed // Accessible without any modifier pressed
JLO_B_PB(KeyType::JUMP, bm | 1 << 0, 1 << 0); JLO_B_PB(KeyType::JUMP, bm | 1 << 0, 1 << 0);
@ -84,8 +84,8 @@ JoystickLayout create_default_layout()
// Accessible with start button not pressed, but four pressed // Accessible with start button not pressed, but four pressed
// TODO find usage for button 0 // TODO find usage for button 0
JLO_B_PB(KeyType::DROP, bm | 1 << 1, fb | 1 << 1); JLO_B_PB(KeyType::DROP, bm | 1 << 1, fb | 1 << 1);
JLO_B_PB(KeyType::SCROLL_UP, bm | 1 << 4, fb | 1 << 4); JLO_B_PB(KeyType::HOTBAR_PREV, bm | 1 << 4, fb | 1 << 4);
JLO_B_PB(KeyType::SCROLL_DOWN,bm | 1 << 5, fb | 1 << 5); JLO_B_PB(KeyType::HOTBAR_NEXT, bm | 1 << 5, fb | 1 << 5);
// Accessible with start button and four pressed // Accessible with start button and four pressed
// TODO find usage for buttons 0, 1 and 4, 5 // TODO find usage for buttons 0, 1 and 4, 5
@ -99,8 +99,8 @@ JoystickLayout create_default_layout()
JLO_A_PB(KeyType::RIGHT, 0, -1, 1024); JLO_A_PB(KeyType::RIGHT, 0, -1, 1024);
// Scroll buttons // Scroll buttons
JLO_A_PB(KeyType::SCROLL_UP, 2, -1, 1024); JLO_A_PB(KeyType::HOTBAR_PREV, 2, -1, 1024);
JLO_A_PB(KeyType::SCROLL_DOWN, 5, -1, 1024); JLO_A_PB(KeyType::HOTBAR_NEXT, 5, -1, 1024);
return jlo; return jlo;
} }
@ -134,10 +134,10 @@ JoystickLayout create_xbox_layout()
JLO_B_PB(KeyType::SNEAK, 1 << 12, 1 << 12); // right JLO_B_PB(KeyType::SNEAK, 1 << 12, 1 << 12); // right
// Triggers // Triggers
JLO_B_PB(KeyType::MOUSE_L, 1 << 6, 1 << 6); // lt JLO_B_PB(KeyType::DIG, 1 << 6, 1 << 6); // lt
JLO_B_PB(KeyType::MOUSE_R, 1 << 7, 1 << 7); // rt JLO_B_PB(KeyType::PLACE, 1 << 7, 1 << 7); // rt
JLO_B_PB(KeyType::SCROLL_UP, 1 << 4, 1 << 4); // lb JLO_B_PB(KeyType::HOTBAR_PREV, 1 << 4, 1 << 4); // lb
JLO_B_PB(KeyType::SCROLL_DOWN, 1 << 5, 1 << 5); // rb JLO_B_PB(KeyType::HOTBAR_NEXT, 1 << 5, 1 << 5); // rb
// D-PAD // D-PAD
JLO_B_PB(KeyType::ZOOM, 1 << 15, 1 << 15); // up JLO_B_PB(KeyType::ZOOM, 1 << 15, 1 << 15); // up

6
src/client/keys.h
View File

@ -110,12 +110,6 @@ public:
SLOT_31, SLOT_31,
SLOT_32, SLOT_32,
// joystick specific keys
MOUSE_L,
MOUSE_R,
SCROLL_UP,
SCROLL_DOWN,
// Fake keycode for array size and internal checks // Fake keycode for array size and internal checks
INTERNAL_ENUM_COUNT INTERNAL_ENUM_COUNT