mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

remap-redux part 2: only add items for devices set to RETRO_DEVICE_KEYBOARD (or a subclass)

Browse Source
This commit is contained in:
radius 2018-03-30 23:28:20 -05:00
parent daf262da96
commit f6ee035011
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
input/input_remapping.c
View File

@ -263,7 +263,6 @@ void input_remapping_set_defaults(bool deinit)
if (keybind) if (keybind)
settings->uints.input_remap_ids[i][j] = keybind->id; settings->uints.input_remap_ids[i][j] = keybind->id;
settings->uints.input_keymapper_ids[i][j] = RETROK_UNKNOWN; settings->uints.input_keymapper_ids[i][j] = RETROK_UNKNOWN;
} }
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
settings->uints.input_remap_ids[i][RARCH_FIRST_CUSTOM_BIND + j] = j; settings->uints.input_remap_ids[i][RARCH_FIRST_CUSTOM_BIND + j] = j;

7
menu/menu_displaylist.c
View File

@ -3274,13 +3274,15 @@ static int menu_displaylist_parse_options_remappings(
if (system) if (system)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
unsigned device;
unsigned device = settings->uints.input_libretro_device[settings->uints.keymapper_port]; for (int i = 0; i < 8; i++)
{
device = settings->uints.input_libretro_device[i];
device &= RETRO_DEVICE_MASK; device &= RETRO_DEVICE_MASK;
if (device == RETRO_DEVICE_KEYBOARD) if (device == RETRO_DEVICE_KEYBOARD)
{ {
for (int i = 0; i < 8; i++)
for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++) for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++)
{ {
unsigned user = settings->uints.keymapper_port + 1; unsigned user = settings->uints.keymapper_port + 1;
@ -3310,6 +3312,7 @@ static int menu_displaylist_parse_options_remappings(
} }
} }
} }
}
#endif #endif
return 0; return 0;