vary r_drawparticles_drawdistance and r_drawdecals_drawdistance for

[xonotic/darkplaces.git] / cl_demo.c

diff --git a/cl_demo.c b/cl_demo.c
index f6987f47195fa9bff79b2021ce5849017d001a74..9d8e4a0056c8fab3ed84402109746ad8f19e2eda 100644 (file)
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -138,7 +138,7 @@ void CL_ReadDemoMessage(void)
        if (cls.demopaused)
                return;
 
-       while (1)
+       for (;;)
        {
                // decide if it is time to grab the next message
                // always grab until fully connected
@@ -146,35 +146,22 @@ void CL_ReadDemoMessage(void)
                {
                        if (cls.timedemo)
                        {
-                               if (host_framecount == cls.td_lastframe)
-                               {
-                                       // already read this frame's message
-                                       return;
-                               }
-                               if (cls.td_lastframe == -1)
-                               {
-                                       // render a couple frames before we start counting
-                                       cls.td_startframe = host_framecount + 3;
-                               }
-                               cls.td_lastframe = host_framecount;
+                               cls.td_frames++;
                                cls.td_onesecondframes++;
-                               // don't read any new messages during the warm-up period
-                               if (host_framecount < cls.td_startframe)
-                                       return;
                                // if this is the first official frame we can now grab the real
                                // td_starttime so the bogus time on the first frame doesn't
                                // count against the final report
-                               if (host_framecount == cls.td_startframe)
+                               if (cls.td_frames == 0)
                                {
                                        cls.td_starttime = realtime;
-                                       cls.td_onesecondnexttime = realtime + 1;
+                                       cls.td_onesecondnexttime = cl.time + 1;
                                        cls.td_onesecondframes = 0;
                                        cls.td_onesecondminframes = 0;
                                        cls.td_onesecondmaxframes = 0;
                                        cls.td_onesecondavgframes = 0;
                                        cls.td_onesecondavgcount = 0;
                                }
-                               if (realtime >= cls.td_onesecondnexttime)
+                               if (cl.time >= cls.td_onesecondnexttime)
                                {
                                        if (cls.td_onesecondavgcount == 0)
                                        {
@@ -216,6 +203,9 @@ void CL_ReadDemoMessage(void)
                        // In case the demo contains a "svc_disconnect" message
                        if (!cls.demoplayback)
                                return;
+
+                       if (cls.timedemo)
+                               return;
                }
                else
                {
@@ -395,8 +385,7 @@ void CL_FinishTimeDemo (void)
 
        cls.timedemo = false;
 
-// the first frame didn't count
-       frames = (host_framecount - cls.td_startframe) - 1;
+       frames = cls.td_frames;
        time = realtime - cls.td_starttime;
        totalfpsavg = time > 0 ? frames / time : 0;
        fpsmin = cls.td_onesecondminframes;
@@ -437,8 +426,8 @@ void CL_TimeDemo_f (void)
        scr_con_current = 0;
 
        cls.timedemo = true;
-       // get first message this frame
-       cls.td_lastframe = -1;
+       cls.td_frames = -2;             // skip the first frame
+       cls.demonum = -1;               // stop demo loop
        cls.demonum = -1;               // stop demo loop
 }