From fc312c111c0afaa2e4879bfd24c9183003c82edc Mon Sep 17 00:00:00 2001
From: lordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 1 Jun 2002 21:30:36 +0000
Subject: [PATCH] remove unused DrawNotifyString, fix intermission screen so
 only the finale-style intermission screens print a message slowly onto the
 screen

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1886 d7cf8633-e32d-0410-b094-e92efae38249
---
 cl_screen.c | 49 +++++++++++--------------------------------------
 1 file changed, 11 insertions(+), 38 deletions(-)

diff --git a/cl_screen.c b/cl_screen.c
index 212c356c..74f00efc 100644
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -130,6 +130,10 @@ void SCR_CheckDrawCenterString (void)
 
 	scr_centertime_off -= host_frametime;
 
+	// don't draw if this is a normal stats-screen intermission,
+	// only if it is not an intermission, or a finale intermission
+	if (cl.intermission == 1)
+		return;
 	if (scr_centertime_off <= 0 && !cl.intermission)
 		return;
 	if (key_dest != key_game)
@@ -349,39 +353,6 @@ void SCR_EndLoadingPlaque (void)
 
 //=============================================================================
 
-char	*scr_notifystring;
-
-void SCR_DrawNotifyString (void)
-{
-	char	*start;
-	int		l;
-	int		x, y;
-
-	start = scr_notifystring;
-
-	y = vid.conheight*0.35;
-
-	do
-	{
-	// scan the width of the line
-		for (l=0 ; l<40 ; l++)
-			if (start[l] == '\n' || !start[l])
-				break;
-		x = (vid.conwidth - l*8)/2;
-		DrawQ_String (x, y, start, l, 8, 8, 1, 1, 1, 1, 0);
-
-		y += 8;
-
-		while (*start && *start != '\n')
-			start++;
-
-		if (!*start)
-			break;
-		start++;		// skip the \n
-	}
-	while (1);
-}
-
 char r_speeds_string[1024];
 int speedstringcount, r_timereport_active;
 double r_timereport_temp = 0, r_timereport_current = 0, r_timereport_start = 0;
@@ -1029,12 +1000,14 @@ void CL_UpdateScreen(void)
 
 	R_TimeReport("setup");
 
-	SCR_DrawRam();
-	SCR_DrawNet();
-	SCR_DrawTurtle();
-	SCR_DrawPause();
-	SCR_CheckDrawCenterString();
+	SCR_DrawRam ();
+	SCR_DrawNet ();
+	SCR_DrawTurtle ();
+	SCR_DrawPause ();
+
 	Sbar_Draw();
+
+	SCR_CheckDrawCenterString();
 	SHOWLMP_drawall();
 
 	SCR_DrawConsole();
-- 
2.39.2