mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-23 11:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Buildfixes

Browse Source
This commit is contained in:
twinaphex 2016-06-17 22:12:06 +02:00
parent 643557d9d6
commit ff36aa94e5
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
menu/drivers/xmb.c
View File

@ -1782,7 +1782,6 @@ static void xmb_draw_items(xmb_handle_t *xmb,
{ {
math_matrix_4x4 mymat; math_matrix_4x4 mymat;
menu_display_ctx_rotate_draw_t rotate_draw; menu_display_ctx_rotate_draw_t rotate_draw;
uint32_t hash_label = menu_hash_calculate(entry.label);
uintptr_t texture = xmb_icon_get_id(xmb, core_node, node, uintptr_t texture = xmb_icon_get_id(xmb, core_node, node,
entry.enum_idx, entry.type, (i == current)); entry.enum_idx, entry.type, (i == current));
float x = icon_x; float x = icon_x;

4
menu/menu_displaylist.c
View File

@ -3756,8 +3756,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
{ {
char lbl[PATH_MAX_LENGTH] = {0}; char lbl[PATH_MAX_LENGTH] = {0};
unsigned val = atoi(info->path); unsigned val = atoi(info->path);
snprintf(lbl, sizeof(lbl), const char *temp_val = menu_hash_to_str_enum((enum menu_hash_enums)(MENU_ENUM_LABEL_INPUT_USER_1_BINDS + (val-1)));
menu_hash_to_str_enum(MENU_ENUM_LABEL_INPUT_USER_1_BINDS + (val-1))); strlcpy(lbl, temp_val, sizeof(lbl));
ret = menu_displaylist_parse_settings(menu, info, ret = menu_displaylist_parse_settings(menu, info,
lbl, PARSE_NONE, true); lbl, PARSE_NONE, true);
info->need_refresh = true; info->need_refresh = true;

7
menu/menu_setting.c
View File

@ -3700,16 +3700,19 @@ static bool setting_append_list_input_player_options(
rarch_setting_group_info_t group_info = {0}; rarch_setting_group_info_t group_info = {0};
rarch_setting_group_info_t subgroup_info = {0}; rarch_setting_group_info_t subgroup_info = {0};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
const char *temp_value = NULL;
const struct retro_keybind* const defaults = const struct retro_keybind* const defaults =
(user == 0) ? retro_keybinds_1 : retro_keybinds_rest; (user == 0) ? retro_keybinds_1 : retro_keybinds_rest;
rarch_system_info_t *system = NULL; rarch_system_info_t *system = NULL;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system); runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
temp_value =menu_hash_to_str_enum((enum menu_hash_enums)(MENU_ENUM_LABEL_INPUT_USER_1_BINDS + user));
snprintf(buffer[user], sizeof(buffer[user]), snprintf(buffer[user], sizeof(buffer[user]),
"%s %u", menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_USER), user + 1); "%s %u", menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_USER), user + 1);
snprintf(group_lbl[user], sizeof(group_lbl[user]),
menu_hash_to_str_enum(MENU_ENUM_LABEL_INPUT_USER_1_BINDS + user)); strlcpy(group_lbl[user], temp_value, sizeof(group_lbl[user]));
START_GROUP(list, list_info, &group_info, group_lbl[user], parent_group); START_GROUP(list, list_info, &group_info, group_lbl[user], parent_group);