From f51e37247708b3f4498015773a6560115c6d97ae Mon Sep 17 00:00:00 2001 From: Jamiras Date: Mon, 9 Nov 2020 20:18:31 -0700 Subject: [PATCH] differentiate between no achievements for a set and not being logged in --- cheevos/cheevos.c | 13 ++++++++++++- intl/msg_hash_us.h | 6 +++++- msg_hash.h | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c index d194eff6ac..12c431dac8 100644 --- a/cheevos/cheevos.c +++ b/cheevos/cheevos.c @@ -1207,11 +1207,22 @@ void rcheevos_populate_menu(void* data) if (i == 0) { - menu_entries_append_enum(info->list, + if (!settings->arrays.cheevos_token[0]) + { + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_LOGGED_IN), + msg_hash_to_str(MENU_ENUM_LABEL_NOT_LOGGED_IN), + MENU_ENUM_LABEL_NOT_LOGGED_IN, + FILE_TYPE_NONE, 0, 0); + } + else + { + menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY), msg_hash_to_str(MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY), MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY, FILE_TYPE_NONE, 0, 0); + } } #endif } diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index d6224fd80a..94db177133 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -6800,7 +6800,7 @@ MSG_HASH( MSG_HASH( MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY, - "No Achievements to Display" + "No achievements to display" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE, @@ -6818,6 +6818,10 @@ MSG_HASH( MENU_ENUM_SUBLABEL_ACHIEVEMENT_RESUME, "Resume achievements for current session. (This action will disable save states, cheats, rewind, pause, and slow-motion and reset the current game)" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_NOT_LOGGED_IN, + "Not logged in" +) /* Quick Menu > Information */ diff --git a/msg_hash.h b/msg_hash.h index 3de8901e33..4c5245d3b6 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1258,6 +1258,7 @@ enum msg_hash_enums MENU_LABEL(RESET_CORE_ASSOCIATION), MENU_LABEL(MENU_THROTTLE_FRAMERATE), MENU_LABEL(NO_ACHIEVEMENTS_TO_DISPLAY), + MENU_LABEL(NOT_LOGGED_IN), MENU_LABEL(NO_ENTRIES_TO_DISPLAY), MENU_LABEL(DOWNLOAD_PL_ENTRY_THUMBNAILS),