no need to update lightmaps if using r_vertexsurfaces

[xonotic/darkplaces.git] / cl_demo.c

diff --git a/cl_demo.c b/cl_demo.c
index 780b1f1c9b5355cd3a3170eed4405fba941ab2fd..b38a2db5d9f18a70aac5bf01e6c7381b6b2e2464 100644 (file)
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -49,8 +49,6 @@ void CL_NextDemo (void)
        if (cls.demonum == -1)
                return;         // don't play demos
 
-//     SCR_BeginLoadingPlaque ();
-
        if (!cls.demos[cls.demonum][0] || cls.demonum == MAX_DEMOS)
        {
                cls.demonum = 0;
@@ -145,7 +143,7 @@ int CL_GetMessage (void)
                                if (host_framecount == cls.td_startframe + 1)
                                        cls.td_starttime = realtime;
                        }
-                       else if ( /* cl.time > 0 && */ cl.time <= cl.mtime[0])
+                       else if (cl.time <= cl.mtime[0])
                        {
                                        return 0;               // don't need another message yet
                        }
@@ -291,7 +289,7 @@ void CL_Record_f (void)
 
        cls.forcetrack = track;
        Qprintf (cls.demofile, "%i\n", cls.forcetrack);
-       
+
        cls.demorecording = true;
 }
 
@@ -318,13 +316,11 @@ void CL_PlayDemo_f (void)
                return;
        }
 
-//     SCR_BeginLoadingPlaque();
-
 //
 // disconnect from server
 //
        CL_Disconnect ();
-       
+
 //
 // open the demo file
 //
@@ -340,6 +336,8 @@ void CL_PlayDemo_f (void)
                return;
        }
 
+       SCR_BeginLoadingPlaque ();
+
        cls.demoplayback = true;
        cls.state = ca_connected;
        cls.forcetrack = 0;
@@ -352,8 +350,6 @@ void CL_PlayDemo_f (void)
 
        if (neg)
                cls.forcetrack = -cls.forcetrack;
-// ZOID, fscanf is evil
-//     fscanf (cls.demofile, "%i\n", &cls.forcetrack);
 }
 
 /*
@@ -403,6 +399,7 @@ void CL_TimeDemo_f (void)
 
        // instantly hide console and deactivate it
        key_dest = key_game;
+       key_consoleactive = 0;
        scr_conlines = 0;
        scr_con_current = 0;