Merge pull request #10858 from Jamiras/cheevos_hardcore_pause_unlock

(cheevos) correctly report unlocked non-hardcore achievements when hardcore is paused
This commit is contained in:
Autechre 2020-06-15 18:29:46 +02:00 committed by GitHub
commit ffdbb968f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1153,7 +1153,7 @@ void rcheevos_get_achievement_state(unsigned index, char *buffer, size_t buffer_
else
{
settings_t* settings = config_get_ptr();
bool hardcore = settings->bools.cheevos_hardcore_mode_enable;
bool hardcore = settings->bools.cheevos_hardcore_mode_enable && !rcheevos_hardcore_paused;
if (hardcore && !(cheevo->active & RCHEEVOS_ACTIVE_HARDCORE))
enum_idx = MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ENTRY_HARDCORE;
else if (!hardcore && !(cheevo->active & RCHEEVOS_ACTIVE_SOFTCORE))