Miroirs/wipeout-rewrite
1
0
Fork 0
mirror of https://github.com/phoboslab/wipeout-rewrite synced 2024-12-26 09:59:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove: unneeded extra keyactions

Browse source
This commit is contained in:
spykyvenator 2024-03-02 14:19:54 +01:00
parent e916dfbb0c
commit 5df422e705
4 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/wipeout/game.c
View file

@ -544,15 +544,15 @@ void game_init(void) {
input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_LEFT, A_MENU_LEFT); input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_LEFT, A_MENU_LEFT);
input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_RIGHT, A_MENU_RIGHT); input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_RIGHT, A_MENU_RIGHT);
input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_W, A_MENU_UP_2); input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_W, A_MENU_UP);
input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_S, A_MENU_DOWN_2); input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_S, A_MENU_DOWN);
input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_A, A_MENU_LEFT_2); input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_A, A_MENU_LEFT);
input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_D, A_MENU_RIGHT_2); input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_D, A_MENU_RIGHT);
input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_K, A_MENU_UP_3); input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_K, A_MENU_UP);
input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_J, A_MENU_DOWN_3); input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_J, A_MENU_DOWN);
input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_H, A_MENU_LEFT_3); input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_H, A_MENU_LEFT);
input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_L, A_MENU_RIGHT_3); input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_L, A_MENU_RIGHT);
input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_BACKSPACE, A_MENU_BACK); input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_BACKSPACE, A_MENU_BACK);
input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_C, A_MENU_BACK); input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_C, A_MENU_BACK);

8
src/wipeout/game.h
View file

@ -35,14 +35,6 @@ typedef enum {
A_MENU_DOWN, A_MENU_DOWN,
A_MENU_LEFT, A_MENU_LEFT,
A_MENU_RIGHT, A_MENU_RIGHT,
A_MENU_UP_2,
A_MENU_DOWN_2,
A_MENU_LEFT_2,
A_MENU_RIGHT_2,
A_MENU_UP_3,
A_MENU_DOWN_3,
A_MENU_LEFT_3,
A_MENU_RIGHT_3,
A_MENU_BACK, A_MENU_BACK,
A_MENU_SELECT, A_MENU_SELECT,
A_MENU_START, A_MENU_START,

4
src/wipeout/ingame_menus.c
View file

@ -325,10 +325,10 @@ static void hall_of_fame_draw_name_entry(menu_t *menu, ui_pos_t anchor, vec2i_t
c_first = 36; c_first = 36;
} }
if (input_pressed(A_MENU_UP) || input_pressed(A_MENU_UP_2) || input_pressed(A_MENU_UP_3)) { if (input_pressed(A_MENU_UP)) {
hs_char_index++; hs_char_index++;
} }
else if (input_pressed(A_MENU_DOWN) || input_pressed(A_MENU_DOWN_2) || input_pressed(A_MENU_DOWN_3)) { else if (input_pressed(A_MENU_DOWN)) {
hs_char_index--; hs_char_index--;
} }

8
src/wipeout/menu.c
View file

@ -86,18 +86,18 @@ void menu_update(menu_t *menu) {
int selected_data = 0; int selected_data = 0;
if (page->entries_len > 0) { if (page->entries_len > 0) {
if (flags_is(page->layout_flags, MENU_HORIZONTAL)) { if (flags_is(page->layout_flags, MENU_HORIZONTAL)) {
if (input_pressed(A_MENU_LEFT) || input_pressed(A_MENU_LEFT_2) || input_pressed(A_MENU_LEFT_3)) { if (input_pressed(A_MENU_LEFT)) {
page->index--; page->index--;
} }
else if (input_pressed(A_MENU_RIGHT) || input_pressed(A_MENU_RIGHT_2) || input_pressed(A_MENU_RIGHT_3)) { else if (input_pressed(A_MENU_RIGHT)) {
page->index++; page->index++;
} }
} }
else { else {
if (input_pressed(A_MENU_UP) || input_pressed(A_MENU_UP_2) || input_pressed(A_MENU_UP_3)) { if (input_pressed(A_MENU_UP)) {
page->index--; page->index--;
} }
if (input_pressed(A_MENU_DOWN) || input_pressed(A_MENU_DOWN_2) || input_pressed(A_MENU_DOWN_3)) { if (input_pressed(A_MENU_DOWN)) {
page->index++; page->index++;
} }
} }