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

Merge pull request #2430 from lakkatv/xmb

Browse Source 
xmb and achievements
This commit is contained in:
Twinaphex 2015-11-19 09:39:27 +01:00
commit 91aa9d54b2
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
menu/drivers/xmb.c
View File

@ -100,6 +100,7 @@ enum
XMB_TEXTURE_CHEAT_OPTIONS, XMB_TEXTURE_CHEAT_OPTIONS,
XMB_TEXTURE_DISK_OPTIONS, XMB_TEXTURE_DISK_OPTIONS,
XMB_TEXTURE_SHADER_OPTIONS, XMB_TEXTURE_SHADER_OPTIONS,
XMB_TEXTURE_ACHIEVEMENT_LIST,
XMB_TEXTURE_SCREENSHOT, XMB_TEXTURE_SCREENSHOT,
XMB_TEXTURE_RELOAD, XMB_TEXTURE_RELOAD,
XMB_TEXTURE_FILE, XMB_TEXTURE_FILE,
@ -1382,6 +1383,9 @@ static void xmb_draw_items(xmb_handle_t *xmb,
case MENU_LABEL_SHADER_OPTIONS: case MENU_LABEL_SHADER_OPTIONS:
icon = xmb->textures.list[XMB_TEXTURE_SHADER_OPTIONS].id; icon = xmb->textures.list[XMB_TEXTURE_SHADER_OPTIONS].id;
break; break;
case MENU_LABEL_ACHIEVEMENT_LIST:
icon = xmb->textures.list[XMB_TEXTURE_ACHIEVEMENT_LIST].id;
break;
case MENU_LABEL_SAVESTATE: case MENU_LABEL_SAVESTATE:
icon = xmb->textures.list[XMB_TEXTURE_SAVESTATE].id; icon = xmb->textures.list[XMB_TEXTURE_SAVESTATE].id;
break; break;
@ -2162,6 +2166,9 @@ static void xmb_context_reset_textures(xmb_handle_t *xmb, const char *iconpath)
case XMB_TEXTURE_SHADER_OPTIONS: case XMB_TEXTURE_SHADER_OPTIONS:
fill_pathname_join(path, iconpath, "core-shader-options.png", sizeof(path)); fill_pathname_join(path, iconpath, "core-shader-options.png", sizeof(path));
break; break;
case XMB_TEXTURE_ACHIEVEMENT_LIST:
fill_pathname_join(path, iconpath, "achievement-list.png", sizeof(path));
break;
case XMB_TEXTURE_SCREENSHOT: case XMB_TEXTURE_SCREENSHOT:
fill_pathname_join(path, iconpath, "screenshot.png", sizeof(path)); fill_pathname_join(path, iconpath, "screenshot.png", sizeof(path));
break; break;

2
menu/menu_displaylist.c
View File

@ -1679,6 +1679,7 @@ static int menu_displaylist_parse_load_content_settings(menu_displaylist_info_t
{ {
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu) if (!menu)
return -1; return -1;
@ -1745,6 +1746,7 @@ static int menu_displaylist_parse_load_content_settings(menu_displaylist_info_t
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#endif #endif
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
if(settings->cheevos.enable)
menu_entries_push(info->list, menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_ACHIEVEMENT_LIST), menu_hash_to_str(MENU_LABEL_VALUE_ACHIEVEMENT_LIST),
menu_hash_to_str(MENU_LABEL_ACHIEVEMENT_LIST), menu_hash_to_str(MENU_LABEL_ACHIEVEMENT_LIST),