Fix --disable-cheevos

This commit is contained in:
twinaphex 2018-05-14 01:44:08 +02:00
parent 7617e3efd2
commit 1a55d4309c
2 changed files with 5 additions and 3 deletions

View File

@ -2638,10 +2638,12 @@ static int action_ok_save_state(const char *path,
return generic_action_ok_command(CMD_EVENT_RESUME);
}
static int action_ok_toggle_hardcode_mode(const char *path,
static int action_ok_cheevos_toggle_hardcore_mode(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
#ifdef HAVE_CHEEVOS
cheevos_hardcore_paused = !cheevos_hardcore_paused;
#endif
generic_action_ok_command(CMD_EVENT_CHEEVOS_HARDCORE_MODE_TOGGLE);
return generic_action_ok_command(CMD_EVENT_RESUME);
}
@ -4663,7 +4665,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
break;
case MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE:
case MENU_ENUM_LABEL_ACHIEVEMENT_RESUME:
BIND_ACTION_OK(cbs, action_ok_toggle_hardcode_mode);
BIND_ACTION_OK(cbs, action_ok_cheevos_toggle_hardcore_mode);
break;
default:
return -1;

View File

@ -2986,11 +2986,11 @@ static enum runloop_state runloop_check_state(
old_should_loadstate = should_loadstate;
}
#ifdef HAVE_CHEEVOS
cheevos_hardcore_active = settings->bools.cheevos_enable
&& settings->bools.cheevos_hardcore_mode_enable
&& cheevos_loaded && !cheevos_hardcore_paused;
#ifdef HAVE_CHEEVOS
if (!cheevos_hardcore_active)
#endif
{