mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 07:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

remap-redux part 2: restore original var names

Browse Source
This commit is contained in:
radius 2018-03-30 13:08:58 -05:00
parent 2bfb5ec0df
commit c57f8722e5
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.h
View File

@ -379,7 +379,7 @@ typedef struct settings
unsigned input_libretro_device[MAX_USERS];
unsigned input_analog_dpad_mode[MAX_USERS];
unsigned input_keymapper_multi_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
unsigned input_keymapper_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
unsigned input_remap_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];

10
input/input_mapper.c
View File

@ -109,22 +109,22 @@ void input_mapper_poll(input_mapper_t *handle)
{
if (j < RETROK_LAST)
{
if (input_state(i, RETRO_DEVICE_JOYPAD, 0, j) && settings->uints.input_keymapper_multi_ids[i][j] != RETROK_UNKNOWN)
if (input_state(i, RETRO_DEVICE_JOYPAD, 0, j) && settings->uints.input_keymapper_ids[i][j] != RETROK_UNKNOWN)
{
MAPPER_SET_KEY (handle,
settings->uints.input_keymapper_multi_ids[i][j]);
settings->uints.input_keymapper_ids[i][j]);
input_keyboard_event(true,
settings->uints.input_keymapper_multi_ids[i][j],
settings->uints.input_keymapper_ids[i][j],
0, 0, RETRO_DEVICE_KEYBOARD);
key_event[j] = true;
}
else
{
if (key_event[j] == false &&
settings->uints.input_keymapper_multi_ids[i][j] != RETROK_UNKNOWN)
settings->uints.input_keymapper_ids[i][j] != RETROK_UNKNOWN)
{
input_keyboard_event(false,
settings->uints.input_keymapper_multi_ids[i][j],
settings->uints.input_keymapper_ids[i][j],
0, 0, RETRO_DEVICE_KEYBOARD);
}
}

6
input/input_remapping.c
View File

@ -87,9 +87,9 @@ bool input_remapping_load_file(void *data, const char *path)
key_remap = -1;
if (config_get_int(conf, keymapper_ident[j], &key_remap))
settings->uints.input_keymapper_multi_ids[i][j] = key_remap;
settings->uints.input_keymapper_ids[i][j] = key_remap;
else
settings->uints.input_keymapper_multi_ids[i][j] = RETROK_UNKNOWN;
settings->uints.input_keymapper_ids[i][j] = RETROK_UNKNOWN;
}
@ -262,7 +262,7 @@ void input_remapping_set_defaults(bool deinit)
const struct retro_keybind *keybind = &input_config_binds[i][j];
if (keybind)
settings->uints.input_remap_ids[i][j] = keybind->id;
settings->uints.input_keymapper_multi_ids[i][j] = RETROK_UNKNOWN;
settings->uints.input_keymapper_ids[i][j] = RETROK_UNKNOWN;
}
for (j = 0; j < 4; j++)

2
menu/cbs/menu_cbs_get_value.c
View File

@ -644,7 +644,7 @@ static void menu_action_setting_disp_set_label_input_desc_kbd(
id = (type / (offset + 1)) - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
remap_id =
settings->uints.input_keymapper_multi_ids[offset][id];
settings->uints.input_keymapper_ids[offset][id];
RARCH_LOG("o: %d, type: %d, remap_id: %d\n", offset, type, remap_id);

4
menu/cbs/menu_cbs_left.c
View File

@ -123,7 +123,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
id = (type / (offset + 1)) - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
remap_id =
settings->uints.input_keymapper_multi_ids[offset][id];
settings->uints.input_keymapper_ids[offset][id];
for (key_id = 0; key_id < MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++)
{
@ -136,7 +136,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
else
key_id = MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
settings->uints.input_keymapper_multi_ids[offset][id] = key_descriptors[key_id].key;
settings->uints.input_keymapper_ids[offset][id] = key_descriptors[key_id].key;
return 0;
}

4
menu/cbs/menu_cbs_right.c
View File

@ -117,7 +117,7 @@ int action_right_input_desc_kbd(unsigned type, const char *label,
id = (type / (offset + 1)) - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
remap_id =
settings->uints.input_keymapper_multi_ids[offset][id];
settings->uints.input_keymapper_ids[offset][id];
for (key_id = 0; key_id < MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++)
{
@ -130,7 +130,7 @@ int action_right_input_desc_kbd(unsigned type, const char *label,
else
key_id = 0;
settings->uints.input_keymapper_multi_ids[offset][id] = key_descriptors[key_id].key;
settings->uints.input_keymapper_ids[offset][id] = key_descriptors[key_id].key;
return 0;
}