SetAnimationFirstLevel(leveldir_current->first_level);
// level_nr may have been set to value over handicap with level editor
- if (setup.handicap && level_nr > leveldir_current->handicap_level)
+ if (setup.allow_skipping_levels != STATE_TRUE && level_nr > leveldir_current->handicap_level)
level_nr = leveldir_current->handicap_level;
LoadLevel(level_nr);
if (new_level_nr > leveldir_current->last_level)
new_level_nr = leveldir_current->last_level;
- if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
+ if (setup.allow_skipping_levels != STATE_TRUE && new_level_nr > leveldir_current->handicap_level)
{
// skipping levels is only allowed when trying to skip single level
// (also, skipping BD style intermission levels is always possible)
if (new_level_nr == old_level_nr + 1 &&
(level.bd_intermission ||
- (setup.skip_levels && Request("Level still unsolved! Skip it anyway?", REQ_ASK))))
+ (setup.allow_skipping_levels == STATE_ASK &&
+ Request("Level still unsolved! Skip it anyway?", REQ_ASK))))
{
leveldir_current->handicap_level++;
SaveLevelSetup_SeriesInfo();
if (type & (TYPE_SWITCH |
TYPE_YES_NO |
TYPE_YES_NO_AUTO |
+ TYPE_YES_NO_ASK |
TYPE_STRING |
TYPE_PLAYER |
TYPE_ECS_AGA |
if (menu_info[choice].type & menu_navigation_type ||
menu_info[choice].type & TYPE_BOOLEAN_STYLE ||
menu_info[choice].type & TYPE_YES_NO_AUTO ||
+ menu_info[choice].type & TYPE_YES_NO_ASK ||
menu_info[choice].type & TYPE_PLAYER)
button = MB_MENU_CHOICE;
}
if (new_level_nr > leveldir_current->last_level)
new_level_nr = leveldir_current->last_level;
- if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
+ if (setup.allow_skipping_levels != STATE_TRUE && new_level_nr > leveldir_current->handicap_level)
new_level_nr = leveldir_current->handicap_level;
if (new_level_nr != old_level_nr)
{ TYPE_SWITCH, &setup.multiple_users, "Multiple Users/Teams:" },
{ TYPE_YES_NO, &setup.input_on_focus, "Only Move Focussed Player:" },
{ TYPE_SWITCH, &setup.time_limit, "Time Limit:" },
+#if 1
+ { TYPE_YES_NO_ASK, &setup.allow_skipping_levels, "Allow Skipping Levels:" },
+#else
{ TYPE_SWITCH, &setup.handicap, "Force Solving Levels:" },
{ TYPE_SWITCH, &setup.skip_levels, "Allow Skipping Levels:" },
+#endif
{ TYPE_SWITCH, &setup.increment_levels, "Increment Solved Levels:" },
{ TYPE_SWITCH, &setup.auto_play_next_level, "Auto-play Next Level:" },
{ TYPE_SWITCH, &setup.count_score_after_game, "Count Score After Game:" },
{ TYPE_ENTER_LIST, &execSetupChooseGameEngineType, "Default Game Engine:" },
{ TYPE_STRING, &game_engine_type_text, "" },
{ TYPE_EMPTY, NULL, "" },
+ { TYPE_ECS_AGA, &setup.prefer_aga_graphics, "Game Graphics Style:" },
+ { TYPE_EMPTY, NULL, "" },
{ TYPE_HEADLINE, NULL, "Boulder Dash" },
{ TYPE_SWITCH, &setup.bd_skip_uncovering, "Skip (un)covering screen:" },
{ TYPE_SWITCH, &setup.bd_skip_hatching, "Skip hatching player:" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_HEADLINE, NULL, "Emerald Mine" },
{ TYPE_SWITCH, &setup.forced_scroll_delay, "Scroll Delay:" },
- { TYPE_ECS_AGA, &setup.prefer_aga_graphics, "Amiga Graphics Chipset:" },
{ TYPE_SWITCH, &setup.prefer_lowpass_sounds, "Low-Pass Filter Sounds:" },
{ TYPE_SWITCH, &setup.prefer_extra_panel_items,"Show Dynamite and Keys:" },
{ TYPE_EMPTY, NULL, "" },
else if (type & TYPE_BOOLEAN_STYLE)
return (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF);
else if (type & TYPE_YES_NO_AUTO)
- return (*(int *)value == AUTO ? FONT_OPTION_ON :
- *(int *)value == FALSE ? FONT_OPTION_OFF : FONT_OPTION_ON);
+ return (*(int *)value == STATE_AUTO ? FONT_OPTION_ON :
+ *(int *)value == STATE_FALSE ? FONT_OPTION_OFF : FONT_OPTION_ON);
+ else if (type & TYPE_YES_NO_ASK)
+ return (*(int *)value == STATE_ASK ? FONT_OPTION_ON :
+ *(int *)value == STATE_FALSE ? FONT_OPTION_OFF : FONT_OPTION_ON);
else if (type & TYPE_PLAYER)
return FONT_VALUE_1;
else
{
*(int *)si->value =
(dx == -1 ?
- (*(int *)si->value == AUTO ? TRUE :
- *(int *)si->value == TRUE ? FALSE : AUTO) :
- (*(int *)si->value == TRUE ? AUTO :
- *(int *)si->value == AUTO ? FALSE : TRUE));
+ (*(int *)si->value == STATE_AUTO ? STATE_TRUE :
+ *(int *)si->value == STATE_TRUE ? STATE_FALSE : STATE_AUTO) :
+ (*(int *)si->value == STATE_TRUE ? STATE_AUTO :
+ *(int *)si->value == STATE_AUTO ? STATE_FALSE : STATE_TRUE));
+ }
+ else if (si->type & TYPE_YES_NO_ASK)
+ {
+ *(int *)si->value =
+ (dx == -1 ?
+ (*(int *)si->value == STATE_ASK ? STATE_TRUE :
+ *(int *)si->value == STATE_TRUE ? STATE_FALSE : STATE_ASK) :
+ (*(int *)si->value == STATE_TRUE ? STATE_ASK :
+ *(int *)si->value == STATE_ASK ? STATE_FALSE : STATE_TRUE));
}
else if (si->type & TYPE_KEY)
{
SCREEN_CTRL_ID_SWITCH_ECS_AGA,
SCREEN_MASK_MAIN,
GD_EVENT_RELEASED | GD_EVENT_OFF_BORDERS,
- FALSE, "switch ECS/AGA chipset"
+ FALSE, "switch old/new graphics"
},
{
IMG_MENU_BUTTON_TOUCH_BACK, IMG_MENU_BUTTON_TOUCH_BACK, -1,