extern cvar_t cl_capturevideo;
extern cvar_t cl_capturevideo_demo_stop;
#endif
-int old_vsync = 0;
static void CL_FinishTimeDemo (void);
}
dpsnprintf (str, sizeof(str), "playdemo %s\n", cls.demos[cls.demonum]);
- Cbuf_InsertText(&cmd_local, str);
+ Cbuf_InsertText(cmd_local, str);
cls.demonum++;
}
if (!cls.demostarting) // only quit if not starting another demo
if (Sys_CheckParm("-demo") || Sys_CheckParm("-capturedemo"))
host.state = host_shutdown;
-
- cls.demonum = -1;
-
}
/*
// restart the demo recording
cls.demofile = FS_OpenRealFile(cls.demoname, "wb", false);
if(!cls.demofile)
- Sys_Error("failed to reopen the demo file");
+ Sys_Abort("failed to reopen the demo file");
FS_Printf(cls.demofile, "%i\n", cls.forcetrack);
}
}
}
+ /* 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);
}
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]);
CL_ParseServerMessage();
if (cls.signon != SIGNONS)
- Cbuf_Execute((&cmd_local)->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)
int c, track;
char name[MAX_OSPATH];
char vabuf[1024];
+ int vabuf_len;
c = Cmd_Argc(cmd);
if (c != 2 && c != 3 && c != 4)
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);
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);
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;
qbool neg = false;
qfile_t *f;
- if (Cmd_Argc(cmd) != 2)
- {
- Con_Print("play <demoname> : 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)
cls.demostarting = true;
// disconnect from server
- CL_Disconnect ();
- SV_Shutdown ();
+ CL_Disconnect();
// update networking ports (this is mainly just needed at startup)
NetConn_UpdateSockets();
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;
cls.demostarting = false;
}
+/*
+====================
+CL_PlayDemo_f
+
+playdemo [demoname]
+====================
+*/
+void CL_PlayDemo_f(cmd_state_t *cmd)
+{
+ if (Cmd_Argc(cmd) != 2)
+ {
+ Con_Print("playdemo <demoname> : plays a demo\n");
+ return;
+ }
+
+ CL_PlayDemo(Cmd_Argv(cmd, 1));
+}
+
typedef struct
{
int frames;
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);
+ 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;
if(atoi(sys.argv[i + 1]) > benchmark_runs)
{
// restart the benchmark
- Cbuf_AddText(&cmd_local, 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
else
host.state = host_shutdown;
}
+
+ // Might need to re-enable vsync
+ Cvar_Callback(&vid_vsync);
}
/*
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
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);
}
/*
Con_DPrintf("%i demo(s) in loop\n", c);
for (i=1 ; i<c+1 ; i++)
- strlcpy (cls.demos[i-1], Cmd_Argv(cmd, i), sizeof (cls.demos[i-1]));
+ dp_strlcpy (cls.demos[i-1], Cmd_Argv(cmd, i), sizeof (cls.demos[i-1]));
// LadyHavoc: clear the remaining slots
for (;i <= MAX_DEMOS;i++)
return;
if (cls.demonum == -1)
cls.demonum = 1;
- CL_Disconnect_f (cmd);
- CL_NextDemo ();
+ CL_Disconnect();
+ CL_NextDemo();
}
/*
{
if (!cls.demoplayback)
return;
- CL_Disconnect ();
- SV_Shutdown ();
+ CL_Disconnect();
}
// LadyHavoc: pausedemo command