X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_demo.c;h=ea10bff641738fdbcc909187d2d6e5a828c5a58b;hp=08f84745425d26fcecda08795abe157d892298bf;hb=7c586d061e7308e0e8164827fa0e14b470921d67;hpb=04ebd98618c773b10ada031f18b99f11020b559f

diff --git a/cl_demo.c b/cl_demo.c
index 08f84745..ea10bff6 100644
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -306,10 +306,16 @@ void CL_Stop_f (void)
 	CL_WriteDemoMessage(&buf);
 
 // finish up
+	if(cl_autodemo.integer && (cl_autodemo_delete.integer & 1))
+	{
+		FS_RemoveOnClose(cls.demofile);
+		Con_Print("Completed and deleted demo\n");
+	}
+	else
+		Con_Print("Completed demo\n");
 	FS_Close (cls.demofile);
 	cls.demofile = NULL;
 	cls.demorecording = false;
-	Con_Print("Completed demo\n");
 }
 
 /*
@@ -446,8 +452,10 @@ CL_FinishTimeDemo
 void CL_FinishTimeDemo (void)
 {
 	int frames;
+	int i;
 	double time, totalfpsavg;
 	double fpsmin, fpsavg, fpsmax; // report min/avg/max fps
+	static int benchmark_runs = 0;
 
 	cls.timedemo = false;
 
@@ -459,9 +467,25 @@ void CL_FinishTimeDemo (void)
 	fpsmax = cls.td_onesecondmaxfps;
 	// LordHavoc: timedemo now prints out 7 digits of fraction, and min/avg/max
 	Con_Printf("%i frames %5.7f seconds %5.7f fps, one-second fps min/avg/max: %.0f %.0f %.0f (%i seconds)\n", frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax, cls.td_onesecondavgcount);
-	Log_Printf("benchmark.log", "date %s | enginedate %s | demo %s | commandline %s | result %i frames %5.7f seconds %5.7f fps, one-second fps min/avg/max: %.0f %.0f %.0f (%i seconds)\n", Sys_TimeString("%Y-%m-%d %H:%M:%S"), buildstring, cls.demoname, cmdline.string, frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax, cls.td_onesecondavgcount);
+	Log_Printf("benchmark.log", "date %s | enginedate %s | demo %s | commandline %s | run %d | result %i frames %5.7f seconds %5.7f fps, one-second fps min/avg/max: %.0f %.0f %.0f (%i seconds)\n", Sys_TimeString("%Y-%m-%d %H:%M:%S"), buildstring, cls.demoname, cmdline.string, benchmark_runs + 1, frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax, cls.td_onesecondavgcount);
 	if (COM_CheckParm("-benchmark"))
-		Host_Quit_f();
+	{
+		++benchmark_runs;
+		i = COM_CheckParm("-benchmarkruns");
+		if(i && i + 1 < com_argc)
+		{
+			if(atoi(com_argv[i + 1]) > benchmark_runs)
+			{
+				// restart the benchmark
+				Cbuf_AddText(va("timedemo %s\n", cls.demoname));
+				// cannot execute here
+			}
+			else
+				Host_Quit_f();
+		}
+		else
+			Host_Quit_f();
+	}
 }
 
 /*