From fb3a91834e850319d684698310d6ab155870b677 Mon Sep 17 00:00:00 2001 From: Toad King Date: Sat, 18 Oct 2014 19:49:18 -0500 Subject: [PATCH] fix input configs for players 2-16 --- settings_data.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/settings_data.c b/settings_data.c index 85af4bd140..88ebf3b471 100644 --- a/settings_data.c +++ b/settings_data.c @@ -643,7 +643,7 @@ void setting_data_get_string_representation(rarch_setting_t* setting, #endif snprintf(buf, sizeof_buf, "[KB:%s] [JS:%s] [AX:%s]", key_name, button_name, axis_name); #endif -#if 1 +#if 0 #ifdef HAVE_MENU if (driver.menu != NULL) { @@ -4288,7 +4288,7 @@ static bool setting_data_append_list_input_options( unsigned i, player; START_GROUP(group_info, "Input Options"); - //settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); + settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info); CONFIG_BOOL( @@ -4424,6 +4424,7 @@ static bool setting_data_append_list_input_options( for (i = 0; i < RARCH_BIND_LIST_END; i ++) { char label[PATH_MAX]; + char name[PATH_MAX]; const struct input_bind_map* bind = (const struct input_bind_map*)&input_config_bind_map[i]; @@ -4431,13 +4432,14 @@ static bool setting_data_append_list_input_options( continue; snprintf(label, sizeof(label), "%s %s", buffer[player], bind->desc); + snprintf(name, sizeof(name), "p%u_%s", player + 1, bind->base); CONFIG_BIND( g_settings.input.binds[player][i], player + 1, player, - bind->base, - strdup(label), /* TODO: Find a way to fix this memleak. */ + strdup(name), /* TODO: Find a way to fix these memleaks. */ + strdup(label), &defaults[i], group_info.name, subgroup_info.name);