From 89f450db27fd3172c456d615a52ed82b88c8b321 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 16 Nov 2025 21:47:21 +0100 Subject: [PATCH] Revert "Simplify intermission timer code" This reverts commit ed16c4fd9ffd3031547871d5709c7da53a69e2c8. --- src/y_inter.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/y_inter.c b/src/y_inter.c index 9abbccbd8..c1bdafd32 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -552,8 +552,18 @@ void Y_Ticker(void) intertic++; - if ((timer && !--timer) - || (intertic == endtic)) + // multiplayer uses timer (based on cv_inttime) + if (timer) + { + if (!--timer) + { + Y_EndIntermission(); + Y_FollowIntermission(); + return; + } + } + // single player is hardcoded to go away after awhile + else if (intertic == endtic) { Y_EndIntermission(); Y_FollowIntermission();