X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=f623a7a551c41ab14bc3e0799f5511d35e1de7cc;hb=b8d558a932139b62da4397ee40fa07a8b07bd79a;hp=54236dc840a8b1ff174ba99a153c986e6c5ec2ec;hpb=046fddade0aad54e0e2f41736d18701e12bd3dd1;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 54236dc8..f623a7a5 100644 --- a/src/screens.c +++ b/src/screens.c @@ -2131,8 +2131,10 @@ static void HandleMainMenu_SelectLevel(int step, int direction, if (setup.handicap && new_level_nr > leveldir_current->handicap_level) { // skipping levels is only allowed when trying to skip single level - if (setup.skip_levels && new_level_nr == old_level_nr + 1 && - Request("Level still unsolved! Skip it anyway?", REQ_ASK)) + // (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)))) { leveldir_current->handicap_level++; SaveLevelSetup_SeriesInfo(); @@ -7469,6 +7471,7 @@ static struct TokenInfo setup_info_engines[] = { TYPE_SWITCH, &setup.bd_skip_uncovering, "Skip (un)covering screen:" }, { TYPE_SWITCH, &setup.bd_skip_hatching, "Skip hatching player:" }, { TYPE_SWITCH, &setup.bd_scroll_delay, "Scroll Delay:" }, + { TYPE_YES_NO_AUTO, &setup.bd_smooth_movements, "Smooth Element Movement:" }, { TYPE_EMPTY, NULL, "" }, { TYPE_HEADLINE, NULL, "Emerald Mine" }, { TYPE_SWITCH, &setup.forced_scroll_delay, "Scroll Delay:" }, @@ -10288,7 +10291,7 @@ static void MapScreenGadgets(int num_entries) MapGadget(screen_gadget[scrollbar_info[i].gadget_id]); } -static void UnmapScreenGadgets() +static void UnmapScreenGadgets(void) { int i;