From 04008d76b9f0298b9cd5d495b042055a2cca910d Mon Sep 17 00:00:00 2001
From: spykyvenator <spykyvenator@protonmail.com>
Date: Fri, 1 Mar 2024 12:00:26 +0100
Subject: [PATCH] add: multiple menu keybinds

---
 src/wipeout/game.c | 10 ++++++++++
 src/wipeout/game.h |  8 ++++++++
 src/wipeout/menu.c |  8 ++++----
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/wipeout/game.c b/src/wipeout/game.c
index 919ed21..50c519b 100755
--- a/src/wipeout/game.c
+++ b/src/wipeout/game.c
@@ -544,6 +544,16 @@ void game_init(void) {
 	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_W, A_MENU_UP_2);
+	input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_S, A_MENU_DOWN_2);
+	input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_A, A_MENU_LEFT_2);
+	input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_D, A_MENU_RIGHT_2);
+
+	input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_K, A_MENU_UP_3);
+	input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_J, A_MENU_DOWN_3);
+	input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_H, A_MENU_LEFT_3);
+	input_bind(INPUT_LAYER_SYSTEM, INPUT_KEY_L, A_MENU_RIGHT_3);
+
 	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_V, A_MENU_BACK);
diff --git a/src/wipeout/game.h b/src/wipeout/game.h
index ac62a90..51fc840 100755
--- a/src/wipeout/game.h
+++ b/src/wipeout/game.h
@@ -35,6 +35,14 @@ typedef enum {
 	A_MENU_DOWN,
 	A_MENU_LEFT,
 	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_SELECT,
 	A_MENU_START,
diff --git a/src/wipeout/menu.c b/src/wipeout/menu.c
index 4cd005a..3e2b9cf 100644
--- a/src/wipeout/menu.c
+++ b/src/wipeout/menu.c
@@ -86,18 +86,18 @@ void menu_update(menu_t *menu) {
 	int selected_data = 0;
 	if (page->entries_len > 0) {
 		if (flags_is(page->layout_flags, MENU_HORIZONTAL)) {
-			if (input_pressed(A_MENU_LEFT)) {
+			if (input_pressed(A_MENU_LEFT) || input_pressed(A_MENU_LEFT_2) || input_pressed(A_MENU_LEFT_3)) {
 				page->index--;
 			}
-			else if (input_pressed(A_MENU_RIGHT)) {
+			else if (input_pressed(A_MENU_RIGHT) || input_pressed(A_MENU_RIGHT_2) || input_pressed(A_MENU_RIGHT_3)) {
 				page->index++;
 			}
 		}
 		else {
-			if (input_pressed(A_MENU_UP)) {
+			if (input_pressed(A_MENU_UP) || input_pressed(A_MENU_UP_2) || input_pressed(A_MENU_UP_3)) {
 				page->index--;
 			}
-			if (input_pressed(A_MENU_DOWN)) {
+			if (input_pressed(A_MENU_DOWN) || input_pressed(A_MENU_DOWN_2) || input_pressed(A_MENU_DOWN_3)) {
 				page->index++;
 			}
 		}