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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-07-10 15:04:01 +02:00
parent 167c83b6e6
commit c37e610f10
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
menu/menu_setting.c
View File

@ -3881,9 +3881,8 @@ static bool setting_append_list_input_player_options(
for (i = 0; i < RARCH_BIND_LIST_END; i ++) for (i = 0; i < RARCH_BIND_LIST_END; i ++)
{ {
char label[PATH_MAX_LENGTH]; char label[PATH_MAX_LENGTH] = {0};
char name[PATH_MAX_LENGTH]; char name[PATH_MAX_LENGTH] = {0};
bool do_add = true;
if (input_config_bind_map_get_meta(i)) if (input_config_bind_map_get_meta(i))
continue; continue;
@ -3891,6 +3890,7 @@ static bool setting_append_list_input_player_options(
fill_pathname_noext(label, buffer[user], fill_pathname_noext(label, buffer[user],
" ", " ",
sizeof(label)); sizeof(label));
if ( if (
settings->input.input_descriptor_label_show settings->input.input_descriptor_label_show
&& (i < RARCH_FIRST_META_KEY) && (i < RARCH_FIRST_META_KEY)
@ -3908,7 +3908,7 @@ static bool setting_append_list_input_player_options(
sizeof(label)); sizeof(label));
if (settings->input.input_descriptor_hide_unbound) if (settings->input.input_descriptor_hide_unbound)
do_add = false; continue;
} }
} }
else else
@ -3916,21 +3916,18 @@ static bool setting_append_list_input_player_options(
snprintf(name, sizeof(name), "p%u_%s", user + 1, input_config_bind_map_get_base(i)); snprintf(name, sizeof(name), "p%u_%s", user + 1, input_config_bind_map_get_base(i));
if (do_add) CONFIG_BIND(
{ list, list_info,
CONFIG_BIND( &settings->input.binds[user][i],
list, list_info, user + 1,
&settings->input.binds[user][i], user,
user + 1, strdup(name),
user, strdup(label),
strdup(name), &defaults[i],
strdup(label), &group_info,
&defaults[i], &subgroup_info,
&group_info, parent_group);
&subgroup_info, (*list)[list_info->index - 1].bind_type = i + MENU_SETTINGS_BIND_BEGIN;
parent_group);
(*list)[list_info->index - 1].bind_type = i + MENU_SETTINGS_BIND_BEGIN;
}
} }
END_SUB_GROUP(list, list_info, parent_group); END_SUB_GROUP(list, list_info, parent_group);