#include "quakedef.h"
+#ifdef CONFIG_VIDEO_CAPTURE
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 (str);
+ Cbuf_InsertText(&cmd_client, str);
cls.demonum++;
}
Called when a demo file runs out, or the user starts a game
==============
*/
-// LordHavoc: now called only by CL_Disconnect
+// LadyHavoc: now called only by CL_Disconnect
void CL_StopPlayback (void)
{
+#ifdef CONFIG_VIDEO_CAPTURE
+ if (cl_capturevideo_demo_stop.integer)
+ Cvar_Set(&cvars_all, "cl_capturevideo", "0");
+#endif
+
if (!cls.demoplayback)
return;
if (!cls.demostarting) // only quit if not starting another demo
if (COM_CheckParm("-demo") || COM_CheckParm("-capturedemo"))
- Host_Quit_f();
+ Host_Quit_f(&cmd_client);
}
int i;
float f;
- if (cls.demopaused) // LordHavoc: pausedemo
+ if (cls.demopaused) // LadyHavoc: pausedemo
return;
len = LittleLong (message->cursize);
if (!cls.demoplayback)
return;
- // LordHavoc: pausedemo
+ // LadyHavoc: pausedemo
if (cls.demopaused)
return;
// 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;
}
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;
cls.td_onesecondnexttime++;
}
}
- else if (cl.time <= cl.mtime[0])
+ else if (cl.time < cl.mtime[0])
{
// don't need another message yet
return;
CL_ParseServerMessage();
if (cls.signon != SIGNONS)
- Cbuf_Execute(); // immediately execute svc_stufftext if in the demo before connect!
+ Cbuf_Execute(&cmd_client); // immediately execute svc_stufftext if in the demo before connect!
// In case the demo contains a "svc_disconnect" message
if (!cls.demoplayback)
stop recording a demo
====================
*/
-void CL_Stop_f (void)
+void CL_Stop_f(cmd_state_t *cmd)
{
sizebuf_t buf;
unsigned char bufdata[64];
}
// write a disconnect message to the demo file
- // LordHavoc: don't replace the cl_message when doing this
+ // LadyHavoc: don't replace the cl_message when doing this
buf.data = bufdata;
buf.maxsize = sizeof(bufdata);
SZ_Clear(&buf);
record <demoname> <map> [cd track]
====================
*/
-void CL_Record_f (void)
+void CL_Record_f(cmd_state_t *cmd)
{
int c, track;
char name[MAX_OSPATH];
char vabuf[1024];
- c = Cmd_Argc();
+ c = Cmd_Argc(cmd);
if (c != 2 && c != 3 && c != 4)
{
Con_Print("record <demoname> [<map> [cd track]]\n");
return;
}
- if (strstr(Cmd_Argv(1), ".."))
+ if (strstr(Cmd_Argv(cmd, 1), ".."))
{
Con_Print("Relative pathnames are not allowed.\n");
return;
// write the forced cd track number, or -1
if (c == 4)
{
- track = atoi(Cmd_Argv(3));
+ track = atoi(Cmd_Argv(cmd, 3));
Con_Printf("Forcing CD track to %i\n", cls.forcetrack);
}
else
track = -1;
// get the demo name
- strlcpy (name, Cmd_Argv(1), sizeof (name));
+ strlcpy (name, Cmd_Argv(cmd, 1), sizeof (name));
FS_DefaultExtension (name, ".dem", sizeof (name));
// start the map up
if (c > 2)
- Cmd_ExecuteString ( va(vabuf, sizeof(vabuf), "map %s", Cmd_Argv(2)), src_command, false);
+ Cmd_ExecuteString ( cmd, va(vabuf, sizeof(vabuf), "map %s", Cmd_Argv(cmd, 2)), src_command, false);
// open the demo file
Con_Printf("recording to %s.\n", name);
cls.demofile = FS_OpenRealFile(name, "wb", false);
if (!cls.demofile)
{
- Con_Print("ERROR: couldn't open.\n");
+ Con_Error("ERROR: couldn't open.\n");
return;
}
strlcpy(cls.demoname, name, sizeof(cls.demoname));
play [demoname]
====================
*/
-void CL_PlayDemo_f (void)
+void CL_PlayDemo_f(cmd_state_t *cmd)
{
char name[MAX_QPATH];
int c;
qboolean neg = false;
qfile_t *f;
- if (Cmd_Argc() != 2)
+ if (Cmd_Argc(cmd) != 2)
{
Con_Print("play <demoname> : plays a demo\n");
return;
}
// open the demo file
- strlcpy (name, Cmd_Argv(1), sizeof (name));
+ strlcpy (name, Cmd_Argv(cmd, 1), sizeof (name));
FS_DefaultExtension (name, ".dem", sizeof (name));
f = FS_OpenVirtualFile(name, false);
if (!f)
{
- Con_Printf("ERROR: couldn't open %s.\n", name);
+ Con_Errorf("ERROR: couldn't open %s.\n", name);
cls.demonum = -1; // stop demo loop
return;
}
// disconnect from server
CL_Disconnect ();
- Host_ShutdownServer ();
+ SV_Shutdown ();
// update networking ports (this is mainly just needed at startup)
NetConn_UpdateSockets();
cls.timedemo = 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;
fpsmax = cls.td_onesecondmaxfps;
- // LordHavoc: timedemo now prints out 7 digits of fraction, and min/avg/max
+ // 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"))
{
++benchmark_runs;
i = COM_CheckParm("-benchmarkruns");
- if(i && i + 1 < com_argc)
+ 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;
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(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
}
Z_Free(history);
history = NULL;
- Host_Quit_f();
+ Host_Quit_f(&cmd_client);
}
}
else
- Host_Quit_f();
+ Host_Quit_f(&cmd_client);
}
}
timedemo [demoname]
====================
*/
-void CL_TimeDemo_f (void)
+void CL_TimeDemo_f(cmd_state_t *cmd)
{
- if (Cmd_Argc() != 2)
+ if (Cmd_Argc(cmd) != 2)
{
Con_Print("timedemo <demoname> : gets demo speeds\n");
return;
srand(0); // predictable random sequence for benchmarking
- CL_PlayDemo_f ();
+ CL_PlayDemo_f (cmd);
// cls.td_starttime will be grabbed at the second frame of the demo, so
// all the loading time doesn't get counted