Merge pull request #11545 from Jamiras/cheevos_not_logged_in

differentiate between no achievements for a set and not being logged in
This commit is contained in:
Autechre 2020-11-12 01:51:47 +01:00 committed by GitHub
commit fcd3be15b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions

View File

@ -1207,11 +1207,22 @@ void rcheevos_populate_menu(void* data)
if (i == 0) 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_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY),
msg_hash_to_str(MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY), msg_hash_to_str(MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY),
MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY, MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY,
FILE_TYPE_NONE, 0, 0); FILE_TYPE_NONE, 0, 0);
}
} }
#endif #endif
} }

View File

@ -6810,7 +6810,7 @@ MSG_HASH(
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY, MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY,
"No Achievements to Display" "No achievements to display"
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE, MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE,
@ -6828,6 +6828,10 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_ACHIEVEMENT_RESUME, 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)" "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 */ /* Quick Menu > Information */

View File

@ -1258,6 +1258,7 @@ enum msg_hash_enums
MENU_LABEL(RESET_CORE_ASSOCIATION), MENU_LABEL(RESET_CORE_ASSOCIATION),
MENU_LABEL(MENU_THROTTLE_FRAMERATE), MENU_LABEL(MENU_THROTTLE_FRAMERATE),
MENU_LABEL(NO_ACHIEVEMENTS_TO_DISPLAY), MENU_LABEL(NO_ACHIEVEMENTS_TO_DISPLAY),
MENU_LABEL(NOT_LOGGED_IN),
MENU_LABEL(NO_ENTRIES_TO_DISPLAY), MENU_LABEL(NO_ENTRIES_TO_DISPLAY),
MENU_LABEL(DOWNLOAD_PL_ENTRY_THUMBNAILS), MENU_LABEL(DOWNLOAD_PL_ENTRY_THUMBNAILS),