Merge pull request #6103 from fr500/master
ifdef cheevos variables properly
This commit is contained in:
commit
0b27f539c2
|
@ -2594,9 +2594,12 @@ static int menu_displaylist_parse_load_content_settings(
|
||||||
MENU_SETTING_ACTION_SCREENSHOT, 0, 0);
|
MENU_SETTING_ACTION_SCREENSHOT, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (settings->bools.quick_menu_show_save_load_state
|
||||||
#ifdef HAVE_CHEEVOS
|
#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_displaylist_parse_settings_enum(menu, info,
|
||||||
MENU_ENUM_LABEL_STATE_SLOT, PARSE_ONLY_INT, true);
|
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 &&
|
if (settings->bools.quick_menu_show_save_load_state &&
|
||||||
settings->bools.quick_menu_show_undo_save_load_state &&
|
settings->bools.quick_menu_show_undo_save_load_state
|
||||||
!(settings->bools.cheevos_hardcore_mode_enable && cheevos_loaded))
|
#ifdef HAVE_CHEEVOS
|
||||||
|
&& !(settings->bools.cheevos_hardcore_mode_enable && cheevos_loaded)
|
||||||
|
#endif
|
||||||
|
)
|
||||||
{
|
{
|
||||||
menu_entries_append_enum(info->list,
|
menu_entries_append_enum(info->list,
|
||||||
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE),
|
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_ENUM_LABEL_UNDO_SAVE_STATE,
|
||||||
MENU_SETTING_ACTION_LOADSTATE, 0, 0);
|
MENU_SETTING_ACTION_LOADSTATE, 0, 0);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
if (settings->bools.quick_menu_show_add_to_favorites)
|
if (settings->bools.quick_menu_show_add_to_favorites)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue