From f6214fd8e9eb31890244c31fb2587d7c55ed6b37 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Mon, 13 Nov 2023 21:34:26 +0000
Subject: [PATCH] Tutorial dialogue: Synergy wth titlecard

- Draw in front of the titlecard
- Don't tick while levelloading and not leveltime, so prevent instantly appearing
---
 src/p_tick.c   | 2 +-
 src/st_stuff.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/p_tick.c b/src/p_tick.c
index 5fb008a21..84cc8cf69 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -1162,7 +1162,7 @@ void P_Ticker(boolean run)
 		P_RunChaseCameras();
 	}
 
-	if (run)
+	if (run && !levelloading && leveltime)
 	{
 		K_TickDialogue();
 	}
diff --git a/src/st_stuff.c b/src/st_stuff.c
index c02ad0c8e..e25222f19 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1238,8 +1238,6 @@ static void ST_overlayDrawer(void)
 	}
 
 	K_DrawMidVote();
-
-	K_DrawDialogue();
 }
 
 void ST_DrawDemoTitleEntry(void)
@@ -1546,6 +1544,8 @@ void ST_Drawer(void)
 	if (stagetitle)
 		ST_drawTitleCard();
 
+	K_DrawDialogue();
+
 	// Replay manual-save stuff
 	if (demo.recording && multiplayer && demo.savebutton && demo.savebutton + 3*TICRATE < leveltime)
 	{