libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #6103 from fr500/master

Browse Source 
ifdef cheevos variables properly
This commit is contained in:
Twinaphex 2018-01-14 21:37:43 +01:00 committed by GitHub
commit 0b27f539c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/menu_displaylist.c
View File

@ -2594,9 +2594,12 @@ static int menu_displaylist_parse_load_content_settings(
MENU_SETTING_ACTION_SCREENSHOT, 0, 0);
}
if (settings->bools.quick_menu_show_save_load_state
#ifdef HAVE_CHEEVOS
if (settings->bools.quick_menu_show_save_load_state &&
!(settings->bools.cheevos_hardcore_mode_enable && cheevos_loaded))
&& !(settings->bools.cheevos_hardcore_mode_enable && cheevos_loaded)
#endif
)
{
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_STATE_SLOT, PARSE_ONLY_INT, true);
@ -2615,8 +2618,11 @@ static int menu_displaylist_parse_load_content_settings(
}
if (settings->bools.quick_menu_show_save_load_state &&
settings->bools.quick_menu_show_undo_save_load_state &&
!(settings->bools.cheevos_hardcore_mode_enable && cheevos_loaded))
settings->bools.quick_menu_show_undo_save_load_state
#ifdef HAVE_CHEEVOS
&& !(settings->bools.cheevos_hardcore_mode_enable && cheevos_loaded)
#endif
)
{
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE),
@ -2630,7 +2636,7 @@ static int menu_displaylist_parse_load_content_settings(
MENU_ENUM_LABEL_UNDO_SAVE_STATE,
MENU_SETTING_ACTION_LOADSTATE, 0, 0);
}
#endif
if (settings->bools.quick_menu_show_add_to_favorites)
{