diff --git a/prboom2/src/dsda/skip.c b/prboom2/src/dsda/skip.c index 269226368..2fb1fae6f 100644 --- a/prboom2/src/dsda/skip.c +++ b/prboom2/src/dsda/skip.c @@ -145,9 +145,10 @@ void dsda_EvaluateSkipModeBuildTiccmd(void) { if (!dsda_SkipMode() || gametic <= 0) return; - at_target_tic = demo_skiptics > 0 ? - gametic > demo_skiptics : + at_target_tic = demo_skiptics >= 0 ? + gametic - levelstarttic > demo_skiptics : dsda_DemoTic() - demo_skiptics >= demo_tics_count; + if ((!skip_until_logictic && skip_until_map == -1 && demo_skiptics && at_target_tic) || (demo_warp_reached && at_target_tic)) dsda_ExitSkipMode();