From 0f2e36d34921ef767042173f54f575c3cd2e62b7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 13 Jan 2013 03:17:13 +0100 Subject: [PATCH] (RARCH_CONSOLE) Move default_binds --- console/rarch_console_input.c | 6 +- console/rarch_console_input.h | 1 - general.h | 1 + gx/gx_input.c | 128 +++++++++++++++++----------------- ps3/ps3_input.c | 2 +- xdk/xdk_xinput_input.c | 2 +- 6 files changed, 69 insertions(+), 71 deletions(-) diff --git a/console/rarch_console_input.c b/console/rarch_console_input.c index c6e30ffdf4..3806c2d17f 100644 --- a/console/rarch_console_input.c +++ b/console/rarch_console_input.c @@ -28,8 +28,6 @@ struct platform_bind const char *label; }; -uint64_t rarch_default_keybind_lut[RARCH_CUSTOM_BIND_LIST_END]; - char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][32] = { "RetroPad Button B", /* RETRO_DEVICE_ID_JOYPAD_B */ "RetroPad Button Y", /* RETRO_DEVICE_ID_JOYPAD_Y */ @@ -121,7 +119,7 @@ void rarch_input_set_keybind(unsigned player, unsigned keybind_action, uint64_t break; case KEYBIND_DEFAULT: - *key = rarch_default_keybind_lut[default_retro_joypad_id]; + *key = g_settings.input.default_binds[default_retro_joypad_id]; break; default: @@ -134,7 +132,7 @@ void rarch_input_set_default_keybinds(unsigned player) for (unsigned i = 0; i < RARCH_CUSTOM_BIND_LIST_END; i++) { g_settings.input.binds[player][i].id = i; - g_settings.input.binds[player][i].joykey = rarch_default_keybind_lut[i]; + g_settings.input.binds[player][i].joykey = g_settings.input.default_binds[i]; } g_settings.input.dpad_emulation[player] = DPAD_EMULATION_LSTICK; } diff --git a/console/rarch_console_input.h b/console/rarch_console_input.h index 1a8fa61d2e..664e43c493 100644 --- a/console/rarch_console_input.h +++ b/console/rarch_console_input.h @@ -27,7 +27,6 @@ enum keybind_set_id KEYBIND_DEFAULT }; -extern uint64_t rarch_default_keybind_lut[RARCH_FIRST_META_KEY]; extern char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][32]; extern char rarch_dpad_emulation_name_lut[KEYBIND_DEFAULT][32]; diff --git a/general.h b/general.h index 29e802e4f7..680709139c 100644 --- a/general.h +++ b/general.h @@ -220,6 +220,7 @@ struct settings bool autodetect_enable; #endif #ifdef RARCH_CONSOLE + uint64_t default_binds[RARCH_CUSTOM_BIND_LIST_END]; unsigned map_dpad_to_stick; unsigned device[MAX_PLAYERS]; #endif diff --git a/gx/gx_input.c b/gx/gx_input.c index 6e613a9bf8..82508830ce 100644 --- a/gx/gx_input.c +++ b/gx/gx_input.c @@ -480,77 +480,77 @@ static void gx_set_default_keybind_lut(unsigned device, unsigned port) { #ifdef HW_RVL case GX_DEVICE_WIIMOTE: - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_1].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_A].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_MINUS].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_PLUS].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_UP].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_DOWN].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_LEFT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_2].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_B].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = 0; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = 0; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = 0; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R2] = 0; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3] = 0; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_1].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_A].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_MINUS].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_PLUS].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_UP].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_DOWN].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_LEFT].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_2].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_B].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_L] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_R] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_L2] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_R2] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_L3] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_R3] = 0; break; case GX_DEVICE_NUNCHUK: - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_B].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_2].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_MINUS].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_PLUS].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_UP].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_DOWN].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_LEFT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_A].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_1].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_Z].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_C].joykey;; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = 0; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R2] = 0; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3] = 0; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_B].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_2].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_MINUS].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_PLUS].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_UP].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_DOWN].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_LEFT].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_A].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_1].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_Z].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_C].joykey;; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_L2] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_R2] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_L3] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_R3] = 0; break; case GX_DEVICE_CLASSIC: - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_B].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_Y].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_MINUS].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_PLUS].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_UP].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_DOWN].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_LEFT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_RIGHT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_A].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_X].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_L_TRIGGER].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_R_TRIGGER].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_ZL_TRIGGER].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R2] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_ZR_TRIGGER].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3] = 0; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_B].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_Y].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_MINUS].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_PLUS].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_UP].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_DOWN].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_LEFT].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_RIGHT].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_A].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_X].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_L_TRIGGER].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_R_TRIGGER].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_L2] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_ZL_TRIGGER].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_R2] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_ZR_TRIGGER].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_L3] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_R3] = 0; break; #endif case GX_DEVICE_GAMECUBE: - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_B].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_Y].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_Z_TRIGGER].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_START].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_UP].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_DOWN].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_LEFT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_RIGHT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_A].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_X].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_L_TRIGGER].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_R_TRIGGER].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = 0; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R2] = 0; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3] = 0; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_B].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_Y].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_Z_TRIGGER].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_START].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_UP].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_DOWN].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_LEFT].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_RIGHT].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_A].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_X].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_L_TRIGGER].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_R_TRIGGER].joykey; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_L2] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_R2] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_L3] = 0; + g_settings.input.default_binds[RETRO_DEVICE_ID_JOYPAD_R3] = 0; break; default: break; diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c index 33d0012442..fd0f0bb248 100644 --- a/ps3/ps3_input.c +++ b/ps3/ps3_input.c @@ -477,7 +477,7 @@ static void ps3_set_default_keybind_lut(unsigned device, unsigned port) (void)port; for(int i = 0; i < RARCH_CUSTOM_BIND_LIST_END; i++) - rarch_default_keybind_lut[i] = platform_keys[i].joykey; + g_settings.input.default_binds[i] = platform_keys[i].joykey; } const input_driver_t input_ps3 = { diff --git a/xdk/xdk_xinput_input.c b/xdk/xdk_xinput_input.c index 38a381ecb1..3341e9fe7b 100644 --- a/xdk/xdk_xinput_input.c +++ b/xdk/xdk_xinput_input.c @@ -260,7 +260,7 @@ static void xdk_set_default_keybind_lut(unsigned device, unsigned port) (void)port; for (int i = 0; i < RARCH_CUSTOM_BIND_LIST_END; i++) - rarch_default_keybind_lut[i] = platform_keys[i].joykey; + g_settings.input.default_binds[i] = platform_keys[i].joykey; } static void xdk_input_set_analog_dpad_mapping(unsigned device, unsigned map_dpad_enum, unsigned controller_id)