mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

make the settings correct

Browse Source
This commit is contained in:
radius 2015-04-09 17:49:40 -05:00
parent 828d125ed3
commit 54035aa758
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/input_remapping.c
View File

@ -45,7 +45,7 @@ bool input_remapping_load_file(const char *path)
char buf[64];
char key_ident[RARCH_FIRST_META_KEY][128];
char key_strings[RARCH_FIRST_META_KEY][128] = { "b", "y", "select", "start",
"up", "down", "left", "right", "a", "x", "l", "r", "l2", "r2", "l3", "r3"};
"up", "down", "left", "right", "a", "x", "l", "r", "l2", "r2", "l3", "r3", "l_x_plus", "l_x_minus", "l_y_plus", "l_y_minus", "r_x_plus", "r_x_minus", "r_y_plus", "r_y_minus"};
snprintf(buf, sizeof(buf), "input_player%u", i + 1);
@ -98,7 +98,7 @@ bool input_remapping_save_file(const char *path)
{
char key_ident[RARCH_FIRST_META_KEY][128];
char key_strings[RARCH_FIRST_META_KEY][128] = { "b", "y", "select", "start",
"up", "down", "left", "right", "a", "x", "l", "r", "l2", "r2", "l3", "r3"};
"up", "down", "left", "right", "a", "x", "l", "r", "l2", "r2", "l3", "r3", "l_x_plus" , "l_x_minus", "l_y_plus", "l_y_minus", "r_x_plus", "r_x_minus", "r_y_plus", "r_y_minus" };
snprintf(buf, sizeof(buf), "input_player%u", i + 1);

6
menu/menu_entries_cbs_toggle.c
View File

@ -116,8 +116,8 @@ static int action_toggle_input_desc(unsigned type, const char *label,
unsigned action, bool wraparound)
{
unsigned inp_desc_index_offset = type - MENU_SETTINGS_INPUT_DESC_BEGIN;
unsigned inp_desc_user = inp_desc_index_offset / RARCH_FIRST_CUSTOM_BIND;
unsigned inp_desc_button_index_offset = inp_desc_index_offset - (inp_desc_user * RARCH_FIRST_CUSTOM_BIND);
unsigned inp_desc_user = inp_desc_index_offset / RARCH_FIRST_META_KEY;
unsigned inp_desc_button_index_offset = inp_desc_index_offset - (inp_desc_user * RARCH_FIRST_META_KEY);
settings_t *settings = config_get_ptr();
switch (action)
@ -127,7 +127,7 @@ static int action_toggle_input_desc(unsigned type, const char *label,
settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset]--;
break;
case MENU_ACTION_RIGHT:
if (settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset] < RARCH_FIRST_CUSTOM_BIND)
if (settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset] < RARCH_FIRST_META_KEY)
settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset]++;
break;
}