From 7f1d91caa5bd21b81b3ebcf61b57521be32560fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Thu, 19 Nov 2015 15:14:19 +0700 Subject: [PATCH 1/2] (XMB) Display achievement list icon --- menu/drivers/xmb.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 49d5c2a988..0a1811d4ce 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -100,6 +100,7 @@ enum XMB_TEXTURE_CHEAT_OPTIONS, XMB_TEXTURE_DISK_OPTIONS, XMB_TEXTURE_SHADER_OPTIONS, + XMB_TEXTURE_ACHIEVEMENT_LIST, XMB_TEXTURE_SCREENSHOT, XMB_TEXTURE_RELOAD, XMB_TEXTURE_FILE, @@ -1382,6 +1383,9 @@ static void xmb_draw_items(xmb_handle_t *xmb, case MENU_LABEL_SHADER_OPTIONS: icon = xmb->textures.list[XMB_TEXTURE_SHADER_OPTIONS].id; break; + case MENU_LABEL_ACHIEVEMENT_LIST: + icon = xmb->textures.list[XMB_TEXTURE_ACHIEVEMENT_LIST].id; + break; case MENU_LABEL_SAVESTATE: icon = xmb->textures.list[XMB_TEXTURE_SAVESTATE].id; break; @@ -2162,6 +2166,9 @@ static void xmb_context_reset_textures(xmb_handle_t *xmb, const char *iconpath) case XMB_TEXTURE_SHADER_OPTIONS: fill_pathname_join(path, iconpath, "core-shader-options.png", sizeof(path)); break; + case XMB_TEXTURE_ACHIEVEMENT_LIST: + fill_pathname_join(path, iconpath, "achievement-list.png", sizeof(path)); + break; case XMB_TEXTURE_SCREENSHOT: fill_pathname_join(path, iconpath, "screenshot.png", sizeof(path)); break; From bc44bf4d82266d40acb327de9b890fc912a55a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Thu, 19 Nov 2015 15:18:28 +0700 Subject: [PATCH 2/2] (Menu) Hide achievement list if cheevos is disabled --- menu/menu_displaylist.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 7b3323fa3a..8019399902 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1679,6 +1679,7 @@ static int menu_displaylist_parse_load_content_settings(menu_displaylist_info_t { menu_handle_t *menu = menu_driver_get_ptr(); global_t *global = global_get_ptr(); + settings_t *settings = config_get_ptr(); if (!menu) return -1; @@ -1745,10 +1746,11 @@ static int menu_displaylist_parse_load_content_settings(menu_displaylist_info_t MENU_SETTING_ACTION, 0, 0); #endif #ifdef HAVE_CHEEVOS - menu_entries_push(info->list, - menu_hash_to_str(MENU_LABEL_VALUE_ACHIEVEMENT_LIST), - menu_hash_to_str(MENU_LABEL_ACHIEVEMENT_LIST), - MENU_SETTING_ACTION, 0, 0); + if(settings->cheevos.enable) + menu_entries_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_ACHIEVEMENT_LIST), + menu_hash_to_str(MENU_LABEL_ACHIEVEMENT_LIST), + MENU_SETTING_ACTION, 0, 0); #endif } else