X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_demo.c;h=1e7773fb1d46b707780aa6c4c05c1a8b77af87df;hb=aa150f38ef79b17d32b520bebb5fe5125c7b3ced;hp=01310b58805b2d1ce4e8d6427b4f1becf96fc35c;hpb=36ce5ae052dcaa3bda8be2192c1546b78b943f69;p=xonotic%2Fdarkplaces.git

diff --git a/cl_demo.c b/cl_demo.c
index 01310b58..1e7773fb 100644
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -46,7 +46,7 @@ Called to play the next demo in the demo loop
 */
 void CL_NextDemo (void)
 {
-	char	str[1024];
+	char	str[MAX_INPUTLINE];
 
 	if (cls.demonum == -1)
 		return;		// don't play demos
@@ -86,6 +86,10 @@ void CL_StopPlayback (void)
 
 	if (cls.timedemo)
 		CL_FinishTimeDemo ();
+
+	if (COM_CheckParm("-demo") || COM_CheckParm("-demolooponly"))
+		Host_Quit_f();
+
 }
 
 /*
@@ -112,7 +116,6 @@ void CL_WriteDemoMessage (void)
 		FS_Write (cls.demofile, &f, 4);
 	}
 	FS_Write (cls.demofile, net_message.data, net_message.cursize);
-	FS_Flush (cls.demofile);
 }
 
 /*
@@ -161,11 +164,11 @@ void CL_ReadDemoMessage(void)
 					cls.td_starttime = realtime;
 				if (host_framecount > cls.td_startframe + 2)
 				{
-					cls.td_minframetime = min(cls.td_minframetime, host_realframetime);
-					cls.td_maxframetime = max(cls.td_maxframetime, host_realframetime);
+					cls.td_minframetime = min(cls.td_minframetime, cl.realframetime);
+					cls.td_maxframetime = max(cls.td_maxframetime, cl.realframetime);
 				}
 				else
-					cls.td_minframetime = cls.td_maxframetime = host_realframetime;
+					cls.td_minframetime = cls.td_maxframetime = cl.realframetime;
 			}
 			else if (cl.time <= cl.mtime[0])
 			{
@@ -182,11 +185,11 @@ void CL_ReadDemoMessage(void)
 		VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
 		for (i = 0;i < 3;i++)
 		{
-			r = FS_Read(cls.demofile, &f, 4);
+			r = (int)FS_Read(cls.demofile, &f, 4);
 			cl.mviewangles[0][i] = LittleFloat(f);
 		}
 
-		if (FS_Read(cls.demofile, net_message.data, net_message.cursize) == (size_t)net_message.cursize)
+		if (FS_Read(cls.demofile, net_message.data, net_message.cursize) == net_message.cursize)
 		{
 			MSG_BeginReading();
 			CL_ParseServerMessage();
@@ -287,7 +290,7 @@ void CL_Record_f (void)
 
 	// open the demo file
 	Con_Printf("recording to %s.\n", name);
-	cls.demofile = FS_Open (name, "wb", false);
+	cls.demofile = FS_Open (name, "wb", false, false);
 	if (!cls.demofile)
 	{
 		Con_Print("ERROR: couldn't open.\n");
@@ -310,7 +313,7 @@ play [demoname]
 */
 void CL_PlayDemo_f (void)
 {
-	char	name[256];
+	char	name[MAX_QPATH];
 	int c;
 	qboolean neg = false;
 
@@ -325,17 +328,17 @@ void CL_PlayDemo_f (void)
 
 	// disconnect from server
 	CL_Disconnect ();
-	Host_ShutdownServer (false);
+	Host_ShutdownServer ();
 
 	// update networking ports (this is mainly just needed at startup)
-	NetConn_ClientFrame();
+	NetConn_UpdateSockets();
 
 	// open the demo file
 	strlcpy (name, Cmd_Argv(1), sizeof (name));
 	FS_DefaultExtension (name, ".dem", sizeof (name));
 
 	Con_Printf("Playing demo from %s.\n", name);
-	cls.demofile = FS_Open (name, "rb", false);
+	cls.demofile = FS_Open (name, "rb", false, false);
 	if (!cls.demofile)
 	{
 		Con_Print("ERROR: couldn't open.\n");
@@ -343,8 +346,6 @@ void CL_PlayDemo_f (void)
 		return;
 	}
 
-	SCR_BeginLoadingPlaque ();
-
 	strlcpy(cls.demoname, name, sizeof(cls.demoname));
 	cls.demoplayback = true;
 	cls.state = ca_connected;
@@ -383,11 +384,6 @@ void CL_FinishTimeDemo (void)
 	// LordHavoc: timedemo now prints out 7 digits of fraction, and min/avg/max
 	Con_Printf("%i frames %5.7f seconds %5.7f fps\nmin/avg/max: %5.7f/%5.7f/%5.7f\n", frames, time, fpsavg, fpsmin, fpsavg, fpsmax);
 	Log_Printf("benchmark.log", "date %s | enginedate %s | demo %s | commandline %s | result %i frames %5.7f seconds %5.7f fps min/avg/max: %5.7f/%5.7f/%5.7f\n", Sys_TimeString("%Y-%m-%d %H:%M:%S"), buildstring, cls.demoname, cmdline.string, frames, time, fpsavg, fpsmin, fpsavg, fpsmax);
-	if (gl_videosyncavailable)
-	{
-		Cvar_SetValueQuick (&vid_vsync, old_vsync);
-		qwglSwapIntervalEXT (old_vsync);
-	}
 	if (COM_CheckParm("-benchmark"))
 		Host_Quit_f();
 }
@@ -410,13 +406,6 @@ void CL_TimeDemo_f (void)
 		return;
 	}
 
-	if (gl_videosyncavailable)
-	{
-		old_vsync = vid_vsync.integer;
-		Cvar_SetValueQuick (&vid_vsync, 0);
-		qwglSwapIntervalEXT (0);
-	}
-
 	CL_PlayDemo_f ();
 
 // cls.td_starttime will be grabbed at the second frame of the demo, so
@@ -425,11 +414,10 @@ 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;
 
 	cls.timedemo = true;
 	// get first message this frame
-	cls.td_lastframe = -1;	
+	cls.td_lastframe = -1;
 }