From 7d1e1a578e20e3b23b984a22d8931f00b927cb41 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Tue, 11 Apr 2023 00:03:13 +0100
Subject: [PATCH] (Will merge conflict with new intermission) Do not show
 advancemap string if roundqueue (or nextmapoverride) will have effect next
 round

---
 src/y_inter.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/y_inter.c b/src/y_inter.c
index 884466261..3636834e2 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -539,6 +539,9 @@ skiptallydrawer:
 
 			if (demo.playback)
 				string = va("Replay ends in %d", tickdown);
+			else if ((nextmapoverride != 0)
+			|| (roundqueue.size > 0 && roundqueue.position < roundqueue.size))
+				string = va("Next starts in %d", tickdown);
 			else
 				string = va("%s starts in %d", cv_advancemap.string, tickdown);