X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_demo.c;h=a3be2148d09709c6ab33208eec19313ea9e0f585;hb=refs%2Fheads%2Fbones_was_here%2Fsleep;hp=36fd3ad813bc1ddd25ce646cb4d2d567f3d4398e;hpb=1b5e3869f0fd3e2fe323680784610d48d6efddca;p=xonotic%2Fdarkplaces.git diff --git a/cl_demo.c b/cl_demo.c index 36fd3ad8..a3be2148 100644 --- a/cl_demo.c +++ b/cl_demo.c @@ -67,7 +67,7 @@ void CL_NextDemo (void) } dpsnprintf (str, sizeof(str), "playdemo %s\n", cls.demos[cls.demonum]); - Cbuf_InsertText(&cmd_client, str); + Cbuf_InsertText(cmd_client, str); cls.demonum++; } @@ -97,9 +97,8 @@ void CL_StopPlayback (void) CL_FinishTimeDemo (); if (!cls.demostarting) // only quit if not starting another demo - if (COM_CheckParm("-demo") || COM_CheckParm("-capturedemo")) - Host_Quit_f(&cmd_client); - + if (Sys_CheckParm("-demo") || Sys_CheckParm("-capturedemo")) + host.state = host_shutdown; } /* @@ -213,9 +212,9 @@ void CL_ReadDemoMessage(void) // count against the final report if (cls.td_frames == 0) { - cls.td_starttime = realtime; + cls.td_starttime = host.realtime; cls.td_onesecondnexttime = cl.time + 1; - cls.td_onesecondrealtime = realtime; + cls.td_onesecondrealtime = host.realtime; cls.td_onesecondframes = 0; cls.td_onesecondminfps = 0; cls.td_onesecondmaxfps = 0; @@ -224,13 +223,13 @@ void CL_ReadDemoMessage(void) } if (cl.time >= cls.td_onesecondnexttime) { - double fps = cls.td_onesecondframes / (realtime - cls.td_onesecondrealtime); + double fps = cls.td_onesecondframes / (host.realtime - cls.td_onesecondrealtime); if (cls.td_onesecondavgcount == 0) { cls.td_onesecondminfps = fps; cls.td_onesecondmaxfps = fps; } - cls.td_onesecondrealtime = realtime; + cls.td_onesecondrealtime = host.realtime; cls.td_onesecondminfps = min(cls.td_onesecondminfps, fps); cls.td_onesecondmaxfps = max(cls.td_onesecondmaxfps, fps); cls.td_onesecondavgfps += fps; @@ -275,7 +274,7 @@ void CL_ReadDemoMessage(void) CL_ParseServerMessage(); if (cls.signon != SIGNONS) - Cbuf_Execute(&cmd_client); // immediately execute svc_stufftext if in the demo before connect! + Cbuf_Execute((cmd_client)->cbuf); // immediately execute svc_stufftext if in the demo before connect! // In case the demo contains a "svc_disconnect" message if (!cls.demoplayback) @@ -382,14 +381,14 @@ void CL_Record_f(cmd_state_t *cmd) // start the map up if (c > 2) - Cmd_ExecuteString ( cmd, va(vabuf, sizeof(vabuf), "map %s", Cmd_Argv(cmd, 2)), src_command, false); + Cmd_ExecuteString ( cmd, va(vabuf, sizeof(vabuf), "map %s", Cmd_Argv(cmd, 2)), src_local, false); // open the demo file Con_Printf("recording to %s.\n", name); cls.demofile = FS_OpenRealFile(name, "wb", false); if (!cls.demofile) { - Con_Error("ERROR: couldn't open.\n"); + Con_Print(CON_ERROR "ERROR: couldn't open.\n"); return; } strlcpy(cls.demoname, name, sizeof(cls.demoname)); @@ -407,19 +406,19 @@ void CL_Record_f(cmd_state_t *cmd) ==================== CL_PlayDemo_f -play [demoname] +playdemo [demoname] ==================== */ void CL_PlayDemo_f(cmd_state_t *cmd) { char name[MAX_QPATH]; int c; - qboolean neg = false; + qbool neg = false; qfile_t *f; if (Cmd_Argc(cmd) != 2) { - Con_Print("play : plays a demo\n"); + Con_Print("playdemo : plays a demo\n"); return; } @@ -429,7 +428,7 @@ void CL_PlayDemo_f(cmd_state_t *cmd) f = FS_OpenVirtualFile(name, false); if (!f) { - Con_Errorf("ERROR: couldn't open %s.\n", name); + Con_Printf(CON_ERROR "ERROR: couldn't open %s.\n", name); cls.demonum = -1; // stop demo loop return; } @@ -437,8 +436,10 @@ void CL_PlayDemo_f(cmd_state_t *cmd) cls.demostarting = true; // disconnect from server - CL_Disconnect (); - Host_ShutdownServer (); + if(cls.state == ca_connected) + CL_Disconnect(); + if(sv.active) + SV_Shutdown(); // update networking ports (this is mainly just needed at startup) NetConn_UpdateSockets(); @@ -499,10 +500,10 @@ static void CL_FinishTimeDemo (void) static int benchmark_runs = 0; char vabuf[1024]; - cls.timedemo = false; + cls.timedemo = host.restless = false; frames = cls.td_frames; - time = realtime - cls.td_starttime; + time = host.realtime - cls.td_starttime; totalfpsavg = time > 0 ? frames / time : 0; fpsmin = cls.td_onesecondminfps; fpsavg = cls.td_onesecondavgcount ? cls.td_onesecondavgfps / cls.td_onesecondavgcount : 0; @@ -510,15 +511,15 @@ static void CL_FinishTimeDemo (void) // LadyHavoc: 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 | 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")) + if (Sys_CheckParm("-benchmark")) { ++benchmark_runs; - i = COM_CheckParm("-benchmarkruns"); - if(i && i + 1 < com_argc) + i = Sys_CheckParm("-benchmarkruns"); + if(i && i + 1 < sys.argc) { static benchmarkhistory_t *history = NULL; if(!history) - history = (benchmarkhistory_t *)Z_Malloc(sizeof(*history) * atoi(com_argv[i + 1])); + history = (benchmarkhistory_t *)Z_Malloc(sizeof(*history) * atoi(sys.argv[i + 1])); history[benchmark_runs - 1].frames = frames; history[benchmark_runs - 1].time = time; @@ -527,16 +528,16 @@ static void CL_FinishTimeDemo (void) history[benchmark_runs - 1].fpsavg = fpsavg; history[benchmark_runs - 1].fpsmax = fpsmax; - if(atoi(com_argv[i + 1]) > benchmark_runs) + if(atoi(sys.argv[i + 1]) > benchmark_runs) { // restart the benchmark - Cbuf_AddText(&cmd_client, va(vabuf, sizeof(vabuf), "timedemo %s\n", cls.demoname)); + Cbuf_AddText(cmd_client, va(vabuf, sizeof(vabuf), "timedemo %s\n", cls.demoname)); // cannot execute here } else { // print statistics - int first = COM_CheckParm("-benchmarkruns_skipfirst") ? 1 : 0; + int first = Sys_CheckParm("-benchmarkruns_skipfirst") ? 1 : 0; if(benchmark_runs > first) { #define DO_MIN(f) \ @@ -579,11 +580,11 @@ static void CL_FinishTimeDemo (void) } Z_Free(history); history = NULL; - Host_Quit_f(&cmd_client); + host.state = host_shutdown; } } else - Host_Quit_f(&cmd_client); + host.state = host_shutdown; } } @@ -614,8 +615,110 @@ void CL_TimeDemo_f(cmd_state_t *cmd) key_consoleactive = 0; scr_con_current = 0; - cls.timedemo = true; + cls.timedemo = host.restless = true; cls.td_frames = -2; // skip the first frame cls.demonum = -1; // stop demo loop } +/* +=============================================================================== + +DEMO LOOP CONTROL + +=============================================================================== +*/ + + +/* +================== +CL_Startdemos_f +================== +*/ +static void CL_Startdemos_f(cmd_state_t *cmd) +{ + int i, c; + + if (cls.state == ca_dedicated || Sys_CheckParm("-listen") || Sys_CheckParm("-benchmark") || Sys_CheckParm("-demo") || Sys_CheckParm("-capturedemo")) + return; + + c = Cmd_Argc(cmd) - 1; + if (c > MAX_DEMOS) + { + Con_Printf("Max %i demos in demoloop\n", MAX_DEMOS); + c = MAX_DEMOS; + } + Con_DPrintf("%i demo(s) in loop\n", c); + + for (i=1 ; i