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

diff --git a/cl_demo.c b/cl_demo.c
index 01310b58..f4a4cf4c 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);
 }
 
 /*
@@ -154,18 +157,34 @@ void CL_ReadDemoMessage(void)
 					cls.td_startframe = host_framecount + 1;
 				}
 				cls.td_lastframe = host_framecount;
+				cls.td_onesecondframes++;
 				// 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 (host_framecount > cls.td_startframe + 2)
+					cls.td_onesecondnexttime = realtime + 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)
 				{
-					cls.td_minframetime = min(cls.td_minframetime, host_realframetime);
-					cls.td_maxframetime = max(cls.td_maxframetime, host_realframetime);
+					if (cls.td_onesecondavgcount == 0)
+					{
+						cls.td_onesecondminframes = cls.td_onesecondframes;
+						cls.td_onesecondmaxframes = cls.td_onesecondframes;
+					}
+					cls.td_onesecondminframes = min(cls.td_onesecondminframes, cls.td_onesecondframes);
+					cls.td_onesecondmaxframes = max(cls.td_onesecondmaxframes, cls.td_onesecondframes);
+					cls.td_onesecondavgframes += cls.td_onesecondframes;
+					cls.td_onesecondavgcount++;
+					cls.td_onesecondframes = 0;
+					cls.td_onesecondnexttime++;
 				}
-				else
-					cls.td_minframetime = cls.td_maxframetime = host_realframetime;
 			}
 			else if (cl.time <= cl.mtime[0])
 			{
@@ -182,11 +201,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();
@@ -213,9 +232,6 @@ stop recording a demo
 */
 void CL_Stop_f (void)
 {
-	if (cmd_source != src_command)
-		return;
-
 	if (!cls.demorecording)
 	{
 		Con_Print("Not recording a demo.\n");
@@ -246,9 +262,6 @@ void CL_Record_f (void)
 	int c, track;
 	char name[MAX_OSPATH];
 
-	if (cmd_source != src_command)
-		return;
-
 	c = Cmd_Argc();
 	if (c != 2 && c != 3 && c != 4)
 	{
@@ -268,6 +281,9 @@ void CL_Record_f (void)
 		return;
 	}
 
+	if (cls.state == ca_connected)
+		CL_Disconnect();
+
 	// write the forced cd track number, or -1
 	if (c == 4)
 	{
@@ -287,7 +303,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,13 +326,10 @@ play [demoname]
 */
 void CL_PlayDemo_f (void)
 {
-	char	name[256];
+	char	name[MAX_QPATH];
 	int c;
 	qboolean neg = false;
 
-	if (cmd_source != src_command)
-		return;
-
 	if (Cmd_Argc() != 2)
 	{
 		Con_Print("play <demoname> : plays a demo\n");
@@ -325,17 +338,18 @@ 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));
+	cls.protocol = PROTOCOL_QUAKE;
 
 	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 +357,6 @@ void CL_PlayDemo_f (void)
 		return;
 	}
 
-	SCR_BeginLoadingPlaque ();
-
 	strlcpy(cls.demoname, name, sizeof(cls.demoname));
 	cls.demoplayback = true;
 	cls.state = ca_connected;
@@ -369,7 +381,7 @@ CL_FinishTimeDemo
 void CL_FinishTimeDemo (void)
 {
 	int frames;
-	double time; // LordHavoc: changed timedemo accuracy to double
+	double time, totalfpsavg;
 	double fpsmin, fpsavg, fpsmax; // report min/avg/max fps
 
 	cls.timedemo = false;
@@ -377,17 +389,13 @@ void CL_FinishTimeDemo (void)
 // the first frame didn't count
 	frames = (host_framecount - cls.td_startframe) - 1;
 	time = realtime - cls.td_starttime;
-	fpsmin = cls.td_maxframetime > 0 ? 1.0 / cls.td_maxframetime : 0;
-	fpsavg = time > 0 ? frames / time : 0;
-	fpsmax = cls.td_minframetime > 0 ? 1.0 / cls.td_minframetime : 0;
+	totalfpsavg = time > 0 ? frames / time : 0;
+	fpsmin = cls.td_onesecondminframes;
+	fpsavg = cls.td_onesecondavgcount ? cls.td_onesecondavgframes / cls.td_onesecondavgcount : 0;
+	fpsmax = cls.td_onesecondmaxframes;
 	// 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);
-	}
+	Con_Printf("%i frames %5.7f seconds %5.7f fps, one-second min/avg/max: %.0f %.0f %.0f\n", frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax);
+	Log_Printf("benchmark.log", "date %s | enginedate %s | demo %s | commandline %s | result %i frames %5.7f seconds %5.7f fps, one-second min/avg/max: %.0f %.0f %.0f\n", Sys_TimeString("%Y-%m-%d %H:%M:%S"), buildstring, cls.demoname, cmdline.string, frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax);
 	if (COM_CheckParm("-benchmark"))
 		Host_Quit_f();
 }
@@ -401,22 +409,12 @@ timedemo [demoname]
 */
 void CL_TimeDemo_f (void)
 {
-	if (cmd_source != src_command)
-		return;
-
 	if (Cmd_Argc() != 2)
 	{
 		Con_Print("timedemo <demoname> : gets demo speeds\n");
 		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 +423,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;
 }