remove unused DrawNotifyString, fix intermission screen so only the finale-style...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1886 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_screen.c b/cl_screen.c
index 212c356ca867691d9c8ee5c0b38b7f2ba742ffb8..74f00efcfb47369159cafdcea18c8cf8f3bc6f68 100644 (file)
--- 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();