(Cheevos) More cleanups

This commit is contained in:
twinaphex 2017-05-04 16:15:19 +02:00
parent 10b636f80d
commit dfed19cb4d

View File

@ -3088,10 +3088,9 @@ bool cheevos_load(const void *data)
found: found:
#ifdef CHEEVOS_JSON_OVERRIDE #ifdef CHEEVOS_JSON_OVERRIDE
{ {
FILE* file;
size_t size; size_t size;
FILE *file = fopen(CHEEVOS_JSON_OVERRIDE, "rb");
file = fopen(CHEEVOS_JSON_OVERRIDE, "rb");
fseek(file, 0, SEEK_END); fseek(file, 0, SEEK_END);
size = ftell(file); size = ftell(file);
fseek(file, 0, SEEK_SET); fseek(file, 0, SEEK_SET);
@ -3160,9 +3159,9 @@ void cheevos_populate_menu(void *data, bool hardcore)
for (i = 0; cheevo < end; i++, cheevo++) for (i = 0; cheevo < end; i++, cheevo++)
{ {
if (!hardcore) if (hardcore)
{ {
if (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE) if (cheevo->active & CHEEVOS_ACTIVE_HARDCORE)
menu_entries_append_enum(info->list, cheevo->title, menu_entries_append_enum(info->list, cheevo->title,
cheevo->description, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY, cheevo->description, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
MENU_SETTINGS_CHEEVOS_START + i, 0, 0); MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
@ -3173,7 +3172,7 @@ void cheevos_populate_menu(void *data, bool hardcore)
} }
else else
{ {
if (cheevo->active & CHEEVOS_ACTIVE_HARDCORE) if (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE)
menu_entries_append_enum(info->list, cheevo->title, menu_entries_append_enum(info->list, cheevo->title,
cheevo->description, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY, cheevo->description, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
MENU_SETTINGS_CHEEVOS_START + i, 0, 0); MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
@ -3193,9 +3192,9 @@ void cheevos_populate_menu(void *data, bool hardcore)
for (i = cheevos_locals.core.count; cheevo < end; i++, cheevo++) for (i = cheevos_locals.core.count; cheevo < end; i++, cheevo++)
{ {
if (!hardcore) if (hardcore)
{ {
if (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE) if (cheevo->active & CHEEVOS_ACTIVE_HARDCORE)
menu_entries_append_enum(info->list, cheevo->title, menu_entries_append_enum(info->list, cheevo->title,
cheevo->description, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY, cheevo->description, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
MENU_SETTINGS_CHEEVOS_START + i, 0, 0); MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
@ -3206,7 +3205,7 @@ void cheevos_populate_menu(void *data, bool hardcore)
} }
else else
{ {
if (cheevo->active & CHEEVOS_ACTIVE_HARDCORE) if (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE)
menu_entries_append_enum(info->list, cheevo->title, menu_entries_append_enum(info->list, cheevo->title,
cheevo->description, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY, cheevo->description, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
MENU_SETTINGS_CHEEVOS_START + i, 0, 0); MENU_SETTINGS_CHEEVOS_START + i, 0, 0);