X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_demo.c;h=831973dc58cfde3c32486e7890cbd61c9e0f2aed;hb=9ee2ac5e28d3f9dbfa67df6bf3e46354bad72995;hp=780b1f1c9b5355cd3a3170eed4405fba941ab2fd;hpb=d57be67cb00229acb8564b92c8b7c58eeed8a0cb;p=xonotic%2Fdarkplaces.git

diff --git a/cl_demo.c b/cl_demo.c
index 780b1f1c..831973dc 100644
--- 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
 			}
@@ -161,8 +159,8 @@ int CL_GetMessage (void)
 		}
 		
 		net_message.cursize = LittleLong (net_message.cursize);
-		if (net_message.cursize > MAX_MSGLEN)
-			Host_Error ("Demo message > MAX_MSGLEN");
+		if (net_message.cursize > MAX_DATAGRAM)
+			Host_Error ("Demo message > MAX_DATAGRAM");
 		r = Qread (cls.demofile, net_message.data, net_message.cursize);
 		if (r != net_message.cursize)
 		{
@@ -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;