From b88c13ef3391bf3dd29e94f398b5b91fcef7a40e Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 17 Oct 2003 03:32:32 +0000
Subject: [PATCH] read multiple frames from demo if client is falling behind

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3588 d7cf8633-e32d-0410-b094-e92efae38249
---
 cl_demo.c | 84 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/cl_demo.c b/cl_demo.c
index f767dc89..546ce450 100644
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -132,56 +132,62 @@ void CL_ReadDemoMessage(void)
 	if (cls.demopaused)
 		return;
 
-	// decide if it is time to grab the next message
-	// always grab until fully connected
-	if (cls.signon == SIGNONS)
+	while (1)
 	{
-		if (cls.timedemo)
+		// decide if it is time to grab the next message
+		// always grab until fully connected
+		if (cls.signon == SIGNONS)
 		{
-			if (host_framecount == cls.td_lastframe)
+			if (cls.timedemo)
 			{
-				// already read this frame's message
-				return;
+				if (host_framecount == cls.td_lastframe)
+				{
+					// already read this frame's message
+					return;
+				}
+				if (cls.td_lastframe == -1)
+				{
+					// we start counting on the second frame
+					// (after parsing connection stuff)
+					cls.td_startframe = host_framecount + 1;
+				}
+				cls.td_lastframe = host_framecount;
+				// 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)
+					cls.td_starttime = realtime;
 			}
-			if (cls.td_lastframe == -1)
+			else if (cl.time <= cl.mtime[0])
 			{
-				// we start counting on the second frame
-				// (after parsing connection stuff)
-				cls.td_startframe = host_framecount + 1;
+				// don't need another message yet
+				return;
 			}
-			cls.td_lastframe = host_framecount;
-			// 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)
-				cls.td_starttime = realtime;
 		}
-		else if (cl.time <= cl.mtime[0])
+
+		// get the next message
+		FS_Read(cls.demofile, &net_message.cursize, 4);
+		net_message.cursize = LittleLong(net_message.cursize);
+		VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
+		for (i = 0;i < 3;i++)
 		{
-			// don't need another message yet
-			return;
+			r = FS_Read(cls.demofile, &f, 4);
+			cl.mviewangles[0][i] = LittleFloat(f);
 		}
-	}
-
-	// get the next message
-	FS_Read(cls.demofile, &net_message.cursize, 4);
-	net_message.cursize = LittleLong(net_message.cursize);
-	VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
-	for (i = 0;i < 3;i++)
-	{
-		r = FS_Read(cls.demofile, &f, 4);
-		cl.mviewangles[0][i] = LittleFloat(f);
-	}
 
-	if (net_message.cursize > NET_MAXMESSAGE)
-		Host_Error("Demo message > NET_MAXMESSAGE");
-	if (FS_Read(cls.demofile, net_message.data, net_message.cursize) == (size_t)net_message.cursize)
-	{
-		MSG_BeginReading();
-		CL_ParseServerMessage();
+		if (net_message.cursize > NET_MAXMESSAGE)
+			Host_Error("Demo message > NET_MAXMESSAGE");
+		if (FS_Read(cls.demofile, net_message.data, net_message.cursize) == (size_t)net_message.cursize)
+		{
+			MSG_BeginReading();
+			CL_ParseServerMessage();
+		}
+		else
+		{
+			CL_Disconnect();
+			return;
+		}
 	}
-	else
-		CL_Disconnect();
 }
 
 
-- 
2.39.2