mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

remap-redux part 2: fix small issue with keymapper

Browse Source
This commit is contained in:
radius 2018-03-31 11:35:29 -05:00
parent 34649d1abf
commit c4754815b6
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/input_defines.h
View File

@ -28,7 +28,7 @@ RETRO_BEGIN_DECLS
#define MAX_INPUT_DEVICES 16 #define MAX_INPUT_DEVICES 16
#define MAX_KEYS 136 #define RARCH_MAX_KEYS 136
#define RARCH_FIRST_CUSTOM_BIND 16 #define RARCH_FIRST_CUSTOM_BIND 16
#define RARCH_FIRST_LIGHTGUN_BIND RARCH_ANALOG_BIND_LIST_END #define RARCH_FIRST_LIGHTGUN_BIND RARCH_ANALOG_BIND_LIST_END

4
menu/cbs/menu_cbs_left.c
View File

@ -128,7 +128,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
remap_id = remap_id =
settings->uints.input_keymapper_ids[offset][id]; settings->uints.input_keymapper_ids[offset][id];
for (key_id = 0; key_id < MENU_SETTINGS_INPUT_DESC_KBD_END - for (key_id = 0; key_id < RARCH_MAX_KEYS +
MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++) MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++)
{ {
if(remap_id == key_descriptors[key_id].key) if(remap_id == key_descriptors[key_id].key)
@ -138,7 +138,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
if (key_id > 0) if (key_id > 0)
key_id--; key_id--;
else else
key_id = MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id = RARCH_MAX_KEYS + MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
settings->uints.input_keymapper_ids[offset][id] = key_descriptors[key_id].key; settings->uints.input_keymapper_ids[offset][id] = key_descriptors[key_id].key;

2
menu/cbs/menu_cbs_right.c
View File

@ -129,7 +129,7 @@ int action_right_input_desc_kbd(unsigned type, const char *label,
break; break;
} }
if (key_id < MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN) if (key_id < RARCH_MAX_KEYS + MENU_SETTINGS_INPUT_DESC_KBD_BEGIN)
key_id++; key_id++;
else else
key_id = 0; key_id = 0;

2
menu/menu_cbs.c
View File

@ -32,7 +32,7 @@ static void menu_cbs_init_log(const char *entry_label, const char *bind_label, c
#endif #endif
} }
struct key_desc key_descriptors[136] = struct key_desc key_descriptors[RARCH_MAX_KEYS] =
{ {
{RETROK_FIRST, "Unmapped"}, {RETROK_FIRST, "Unmapped"},
{RETROK_BACKSPACE, "Backspace"}, {RETROK_BACKSPACE, "Backspace"},

2
menu/menu_driver.h
View File

@ -208,7 +208,7 @@ enum menu_settings_type
MENU_SETTINGS_INPUT_DESC_BEGIN, MENU_SETTINGS_INPUT_DESC_BEGIN,
MENU_SETTINGS_INPUT_DESC_END = MENU_SETTINGS_INPUT_DESC_BEGIN + (MAX_USERS * (RARCH_FIRST_CUSTOM_BIND + 4)), MENU_SETTINGS_INPUT_DESC_END = MENU_SETTINGS_INPUT_DESC_BEGIN + (MAX_USERS * (RARCH_FIRST_CUSTOM_BIND + 4)),
MENU_SETTINGS_INPUT_DESC_KBD_BEGIN, MENU_SETTINGS_INPUT_DESC_KBD_BEGIN,
MENU_SETTINGS_INPUT_DESC_KBD_END = (MENU_SETTINGS_INPUT_DESC_KBD_BEGIN + 136) * MAX_USERS, MENU_SETTINGS_INPUT_DESC_KBD_END = (MENU_SETTINGS_INPUT_DESC_KBD_BEGIN + RARCH_MAX_KEYS) * MAX_USERS,
MENU_SETTINGS_SUBSYSTEM_LOAD, MENU_SETTINGS_SUBSYSTEM_LOAD,