libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-01-21 00:05:30 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Add a type for empty message entries, fixes a bug in XMB

Browse Source
This commit is contained in:
Jean-André Santoni 2015-10-23 03:43:25 +07:00
parent 942bf6cb93
commit 52c8040589
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
menu/cbs/menu_cbs_left.c
View File

@ -461,6 +461,7 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
case MENU_FILE_CONFIG:
case MENU_FILE_USE_DIRECTORY:
case MENU_FILE_PLAYLIST_ENTRY:
case MENU_INFO_MESSAGE:
case MENU_FILE_DOWNLOAD_CORE:
case MENU_FILE_CHEAT:
case MENU_FILE_REMAP:

1
menu/cbs/menu_cbs_right.c
View File

@ -411,6 +411,7 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
case MENU_FILE_CONFIG:
case MENU_FILE_USE_DIRECTORY:
case MENU_FILE_PLAYLIST_ENTRY:
case MENU_INFO_MESSAGE:
case MENU_FILE_DOWNLOAD_CORE:
case MENU_FILE_CHEAT:
case MENU_FILE_REMAP:

5
menu/drivers/xmb.c
View File

@ -1192,6 +1192,8 @@ static GRuint xmb_icon_get_id(xmb_handle_t *xmb,
return xmb->textures.list[XMB_TEXTURE_SETTING].id;
case MENU_SETTING_GROUP:
return xmb->textures.list[XMB_TEXTURE_SETTING].id;
case MENU_INFO_MESSAGE:
return xmb->textures.list[XMB_TEXTURE_CORE_INFO].id;
}
return xmb->textures.list[XMB_TEXTURE_SUBSETTING].id;
@ -1280,9 +1282,6 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
case MENU_LABEL_CORE_OPTIONS:
icon = xmb->textures.list[XMB_TEXTURE_CORE_OPTIONS].id;
break;
case MENU_LABEL_CORE_INFORMATION:
icon = xmb->textures.list[XMB_TEXTURE_CORE_INFO].id;
break;
case MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS:
icon = xmb->textures.list[XMB_TEXTURE_INPUT_REMAPPING_OPTIONS].id;
break;

1
menu/menu.h
View File

@ -117,6 +117,7 @@ typedef enum
MENU_SETTING_GROUP,
MENU_SETTING_SUBGROUP,
MENU_SETTING_HORIZONTAL_MENU,
MENU_INFO_MESSAGE,
MENU_FILE_TYPE_T_LAST
} menu_file_type_t;

2
menu/menu_displaylist.c
View File

@ -853,7 +853,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE),
menu_hash_to_str(MENU_LABEL_NO_PLAYLIST_ENTRIES_AVAILABLE),
0, 0, 0);
MENU_INFO_MESSAGE, 0, 0);
return 0;
}