CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-24 20:26:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #8725

Browse Source
This commit is contained in:
radius 2019-05-14 00:12:48 -05:00 committed by twinaphex
parent 0dd26fab58
commit 35910e8785
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
command.c
View File

@ -1933,11 +1933,6 @@ bool command_event(enum event_command cmd, void *data)
case CMD_EVENT_SAVE_STATE: case CMD_EVENT_SAVE_STATE:
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
#ifdef HAVE_CHEEVOS
/* RCHEEVOS TODO: remove OR below */
if (cheevos_hardcore_active || rcheevos_hardcore_active)
return false;
#endif
if (settings->bools.savestate_auto_index) if (settings->bools.savestate_auto_index)
{ {

43
menu/menu_displaylist.c
View File

@ -1755,12 +1755,7 @@ 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 if (settings->bools.quick_menu_show_save_load_state)
#ifdef HAVE_CHEEVOS
/* RCHEEVOS TODO: remove 'rcheevos_*' below */
&& !(rcheevos_hardcore_active || cheevos_hardcore_active)
#endif
)
{ {
menu_displaylist_parse_settings_enum(info->list, menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_STATE_SLOT, PARSE_ONLY_INT, true); MENU_ENUM_LABEL_STATE_SLOT, PARSE_ONLY_INT, true);
@ -1770,27 +1765,33 @@ static int menu_displaylist_parse_load_content_settings(
msg_hash_to_str(MENU_ENUM_LABEL_SAVE_STATE), msg_hash_to_str(MENU_ENUM_LABEL_SAVE_STATE),
MENU_ENUM_LABEL_SAVE_STATE, MENU_ENUM_LABEL_SAVE_STATE,
MENU_SETTING_ACTION_SAVESTATE, 0, 0); MENU_SETTING_ACTION_SAVESTATE, 0, 0);
#ifdef HAVE_CHEEVOS
menu_entries_append_enum(info->list, /* RCHEEVOS TODO: remove 'rcheevos_*' below */
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LOAD_STATE), if (!(rcheevos_hardcore_active || cheevos_hardcore_active))
msg_hash_to_str(MENU_ENUM_LABEL_LOAD_STATE), #endif
MENU_ENUM_LABEL_LOAD_STATE, {
MENU_SETTING_ACTION_LOADSTATE, 0, 0); menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LOAD_STATE),
msg_hash_to_str(MENU_ENUM_LABEL_LOAD_STATE),
MENU_ENUM_LABEL_LOAD_STATE,
MENU_SETTING_ACTION_LOADSTATE, 0, 0);
}
} }
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)
{
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
/* RCHEEVOS TODO: remove 'rcheevos_*' below */ /* RCHEEVOS TODO: remove 'rcheevos_*' below */
&& !(rcheevos_hardcore_active || cheevos_hardcore_active) if (!(rcheevos_hardcore_active || cheevos_hardcore_active))
#endif #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), msg_hash_to_str(MENU_ENUM_LABEL_UNDO_LOAD_STATE),
msg_hash_to_str(MENU_ENUM_LABEL_UNDO_LOAD_STATE), MENU_ENUM_LABEL_UNDO_LOAD_STATE,
MENU_ENUM_LABEL_UNDO_LOAD_STATE, MENU_SETTING_ACTION_LOADSTATE, 0, 0);
MENU_SETTING_ACTION_LOADSTATE, 0, 0); }
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNDO_SAVE_STATE), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNDO_SAVE_STATE),