From f43c06303fabf2c8246efe2596b7e6cf0902d59b Mon Sep 17 00:00:00 2001 From: Hyenadae Date: Sat, 9 May 2020 09:28:19 +0100 Subject: [PATCH 1/2] L (Trigger) is real. Keyboard only for now. --- src/pc/configfile.c | 2 ++ src/pc/controller/controller_keyboard.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pc/configfile.c b/src/pc/configfile.c index 10ff1e6..8bcc24d 100644 --- a/src/pc/configfile.c +++ b/src/pc/configfile.c @@ -34,6 +34,7 @@ bool configFullscreen = false; unsigned int configKeyA = 0x26; unsigned int configKeyB = 0x33; unsigned int configKeyStart = 0x39; +unsigned int configKeyL = 0x35; unsigned int configKeyR = 0x36; unsigned int configKeyZ = 0x25; unsigned int configKeyCUp = 0x148; @@ -51,6 +52,7 @@ static const struct ConfigOption options[] = { {.name = "key_a", .type = CONFIG_TYPE_UINT, .uintValue = &configKeyA}, {.name = "key_b", .type = CONFIG_TYPE_UINT, .uintValue = &configKeyB}, {.name = "key_start", .type = CONFIG_TYPE_UINT, .uintValue = &configKeyStart}, + {.name = "key_l", .type = CONFIG_TYPE_UINT, .uintValue = &configKeyL}, {.name = "key_r", .type = CONFIG_TYPE_UINT, .uintValue = &configKeyR}, {.name = "key_z", .type = CONFIG_TYPE_UINT, .uintValue = &configKeyZ}, {.name = "key_cup", .type = CONFIG_TYPE_UINT, .uintValue = &configKeyCUp}, diff --git a/src/pc/controller/controller_keyboard.c b/src/pc/controller/controller_keyboard.c index a49b86a..87eaee0 100644 --- a/src/pc/controller/controller_keyboard.c +++ b/src/pc/controller/controller_keyboard.c @@ -11,7 +11,7 @@ static int keyboard_buttons_down; -static int keyboard_mapping[13][2]; +static int keyboard_mapping[14][2]; static int keyboard_map_scancode(int scancode) { int ret = 0; @@ -58,6 +58,7 @@ static void keyboard_init(void) { set_keyboard_mapping(i++, L_CBUTTONS, configKeyCLeft); set_keyboard_mapping(i++, D_CBUTTONS, configKeyCDown); set_keyboard_mapping(i++, R_CBUTTONS, configKeyCRight); + set_keyboard_mapping(i++, L_TRIG, configKeyL); set_keyboard_mapping(i++, R_TRIG, configKeyR); set_keyboard_mapping(i++, START_BUTTON, configKeyStart); From 0413703a6023123e0263951865fb16b90938d1cb Mon Sep 17 00:00:00 2001 From: Hyenadae Date: Sat, 9 May 2020 09:31:15 +0100 Subject: [PATCH 2/2] L (Trigger) is real. Keyboard only for now. --- src/pc/configfile.c | 2 +- src/pc/configfile.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pc/configfile.c b/src/pc/configfile.c index 8bcc24d..a2de665 100644 --- a/src/pc/configfile.c +++ b/src/pc/configfile.c @@ -34,7 +34,7 @@ bool configFullscreen = false; unsigned int configKeyA = 0x26; unsigned int configKeyB = 0x33; unsigned int configKeyStart = 0x39; -unsigned int configKeyL = 0x35; +unsigned int configKeyL = 0x34; unsigned int configKeyR = 0x36; unsigned int configKeyZ = 0x25; unsigned int configKeyCUp = 0x148; diff --git a/src/pc/configfile.h b/src/pc/configfile.h index ae9070b..7128aaa 100644 --- a/src/pc/configfile.h +++ b/src/pc/configfile.h @@ -5,6 +5,7 @@ extern bool configFullscreen; extern unsigned int configKeyA; extern unsigned int configKeyB; extern unsigned int configKeyStart; +extern unsigned int configKeyL; extern unsigned int configKeyR; extern unsigned int configKeyZ; extern unsigned int configKeyCUp;