From 4fe26e5608dc9a8fa3c17b9c005210f33790b342 Mon Sep 17 00:00:00 2001 From: Pedro Beirao Date: Tue, 29 Sep 2026 22:39:08 +0100 Subject: [PATCH 1/2] Fix -skipsec and -skiptic not working with -warp --- prboom2/src/dsda/skip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/prboom2/src/dsda/skip.c b/prboom2/src/dsda/skip.c index 2692263688..7708b03a84 100644 --- a/prboom2/src/dsda/skip.c +++ b/prboom2/src/dsda/skip.c @@ -146,8 +146,9 @@ void dsda_EvaluateSkipModeBuildTiccmd(void) { if (!dsda_SkipMode() || gametic <= 0) return; at_target_tic = demo_skiptics > 0 ? - gametic > demo_skiptics : + 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(); From 1f3a1a5571d756d2b12844f4b82aa96c9d833c03 Mon Sep 17 00:00:00 2001 From: Pedro Beirao Date: Wed, 30 Sep 2026 15:20:39 +0100 Subject: [PATCH 2/2] Fix -warp without -skipsec working incorrectly --- prboom2/src/dsda/skip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prboom2/src/dsda/skip.c b/prboom2/src/dsda/skip.c index 7708b03a84..2fb1fae6f9 100644 --- a/prboom2/src/dsda/skip.c +++ b/prboom2/src/dsda/skip.c @@ -145,7 +145,7 @@ void dsda_EvaluateSkipModeBuildTiccmd(void) { if (!dsda_SkipMode() || gametic <= 0) return; - at_target_tic = demo_skiptics > 0 ? + at_target_tic = demo_skiptics >= 0 ? gametic - levelstarttic > demo_skiptics : dsda_DemoTic() - demo_skiptics >= demo_tics_count;