X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_demo.c;h=a11d63b5ba33f5939dc7de352f4940d2e1b85030;hb=26a665ff43052862131df3c63785f91861989fc8;hp=31a1f470b2a9898915a85c998e211ccbd11ce761;hpb=49b4a7773641bbf2a0395bfc43534dc5fa8b5f5f;p=xonotic%2Fdarkplaces.git diff --git a/cl_demo.c b/cl_demo.c index 31a1f470..a11d63b5 100644 --- a/cl_demo.c +++ b/cl_demo.c @@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern cvar_t cl_capturevideo; extern cvar_t cl_capturevideo_demo_stop; #endif -int old_vsync = 0; static void CL_FinishTimeDemo (void); @@ -67,7 +66,7 @@ void CL_NextDemo (void) } dpsnprintf (str, sizeof(str), "playdemo %s\n", cls.demos[cls.demonum]); - Cbuf_InsertText(&cmd_client, str); + Cbuf_InsertText(cmd_local, str); cls.demonum++; } @@ -97,9 +96,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; } /* @@ -246,6 +244,13 @@ void CL_ReadDemoMessage(void) } } + /* At signon 1 the cl_begindownloads command starts the world and, if applicable, + * boots up CSQC which may be required to parse the next message. + * That will be delayed if curl must first (down)load the map. + */ + if (cls.signon == 1 && cl.loadcsqc) // waiting for CL_VM_Init() to be called + return; + // get the next message FS_Read(cls.demofile, &cl_message.cursize, 4); cl_message.cursize = LittleLong(cl_message.cursize); @@ -257,9 +262,8 @@ void CL_ReadDemoMessage(void) } if (cl_message.cursize > cl_message.maxsize) { - Con_Printf("Demo message (%i) > cl_message.maxsize (%i)", cl_message.cursize, cl_message.maxsize); + CL_DisconnectEx(false, "Demo message (%i) > cl_message.maxsize (%i)", cl_message.cursize, cl_message.maxsize); cl_message.cursize = 0; - CL_Disconnect(); return; } VectorCopy(cl.mviewangles[0], cl.mviewangles[1]); @@ -275,7 +279,7 @@ void CL_ReadDemoMessage(void) CL_ParseServerMessage(); if (cls.signon != SIGNONS) - Cbuf_Execute((&cmd_client)->cbuf); // immediately execute svc_stufftext if in the demo before connect! + Cbuf_Execute((cmd_local)->cbuf); // immediately execute svc_stufftext if in the demo before connect! // In case the demo contains a "svc_disconnect" message if (!cls.demoplayback) @@ -344,6 +348,7 @@ void CL_Record_f(cmd_state_t *cmd) int c, track; char name[MAX_OSPATH]; char vabuf[1024]; + int vabuf_len; c = Cmd_Argc(cmd); if (c != 2 && c != 3 && c != 4) @@ -377,12 +382,15 @@ void CL_Record_f(cmd_state_t *cmd) track = -1; // get the demo name - strlcpy (name, Cmd_Argv(cmd, 1), sizeof (name)); + dp_strlcpy (name, Cmd_Argv(cmd, 1), sizeof (name)); FS_DefaultExtension (name, ".dem", sizeof (name)); // start the map up if (c > 2) - Cmd_ExecuteString ( cmd, va(vabuf, sizeof(vabuf), "map %s", Cmd_Argv(cmd, 2)), src_local, false); + { + vabuf_len = dpsnprintf(vabuf, sizeof(vabuf), "map %s", Cmd_Argv(cmd, 2)); + Cmd_ExecuteString(cmd, vabuf, vabuf_len, src_local, false); + } // open the demo file Con_Printf("recording to %s.\n", name); @@ -392,7 +400,7 @@ void CL_Record_f(cmd_state_t *cmd) Con_Print(CON_ERROR "ERROR: couldn't open.\n"); return; } - strlcpy(cls.demoname, name, sizeof(cls.demoname)); + dp_strlcpy(cls.demoname, name, sizeof(cls.demoname)); cls.forcetrack = track; FS_Printf(cls.demofile, "%i\n", cls.forcetrack); @@ -402,29 +410,15 @@ void CL_Record_f(cmd_state_t *cmd) cls.demo_lastcsprogscrc = -1; } - -/* -==================== -CL_PlayDemo_f - -play [demoname] -==================== -*/ -void CL_PlayDemo_f(cmd_state_t *cmd) +void CL_PlayDemo(const char *demo) { - char name[MAX_QPATH]; + 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"); - return; - } - // open the demo file - strlcpy (name, Cmd_Argv(cmd, 1), sizeof (name)); + dp_strlcpy (name, demo, sizeof (name)); FS_DefaultExtension (name, ".dem", sizeof (name)); f = FS_OpenVirtualFile(name, false); if (!f) @@ -437,8 +431,7 @@ void CL_PlayDemo_f(cmd_state_t *cmd) cls.demostarting = true; // disconnect from server - CL_Disconnect (); - SV_Shutdown (); + CL_Disconnect(); // update networking ports (this is mainly just needed at startup) NetConn_UpdateSockets(); @@ -447,7 +440,7 @@ void CL_PlayDemo_f(cmd_state_t *cmd) Con_Printf("Playing demo %s.\n", name); cls.demofile = f; - strlcpy(cls.demoname, name, sizeof(cls.demoname)); + dp_strlcpy(cls.demoname, name, sizeof(cls.demoname)); cls.demoplayback = true; cls.state = ca_connected; @@ -465,6 +458,24 @@ void CL_PlayDemo_f(cmd_state_t *cmd) cls.demostarting = false; } +/* +==================== +CL_PlayDemo_f + +playdemo [demoname] +==================== +*/ +void CL_PlayDemo_f(cmd_state_t *cmd) +{ + if (Cmd_Argc(cmd) != 2) + { + Con_Print("playdemo : plays a demo\n"); + return; + } + + CL_PlayDemo(Cmd_Argv(cmd, 1)); +} + typedef struct { int frames; @@ -509,11 +520,11 @@ static void CL_FinishTimeDemo (void) fpsmax = cls.td_onesecondmaxfps; // 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")) + 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"), engineversion, cls.demoname, cmdline.string, benchmark_runs + 1, frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax, cls.td_onesecondavgcount); + if (Sys_CheckParm("-benchmark")) { ++benchmark_runs; - i = COM_CheckParm("-benchmarkruns"); + i = Sys_CheckParm("-benchmarkruns"); if(i && i + 1 < sys.argc) { static benchmarkhistory_t *history = NULL; @@ -530,13 +541,13 @@ static void CL_FinishTimeDemo (void) 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_local, 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,12 +590,15 @@ 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; } + + // Might need to re-enable vsync + Cvar_Callback(&vid_vsync); } /* @@ -604,7 +618,7 @@ void CL_TimeDemo_f(cmd_state_t *cmd) srand(0); // predictable random sequence for benchmarking - CL_PlayDemo_f (cmd); + CL_PlayDemo(Cmd_Argv(cmd, 1)); // cls.td_starttime will be grabbed at the second frame of the demo, so // all the loading time doesn't get counted @@ -617,6 +631,9 @@ void CL_TimeDemo_f(cmd_state_t *cmd) cls.timedemo = host.restless = true; cls.td_frames = -2; // skip the first frame cls.demonum = -1; // stop demo loop + + // Might need to disable vsync + Cvar_Callback(&vid_vsync); } /* @@ -637,7 +654,7 @@ static void CL_Startdemos_f(cmd_state_t *cmd) { int i, c; - if (cls.state == ca_dedicated || COM_CheckParm("-listen") || COM_CheckParm("-benchmark") || COM_CheckParm("-demo") || COM_CheckParm("-capturedemo")) + if (cls.state == ca_dedicated || Sys_CheckParm("-listen") || Sys_CheckParm("-benchmark") || Sys_CheckParm("-demo") || Sys_CheckParm("-capturedemo")) return; c = Cmd_Argc(cmd) - 1; @@ -649,7 +666,7 @@ static void CL_Startdemos_f(cmd_state_t *cmd) Con_DPrintf("%i demo(s) in loop\n", c); for (i=1 ; i