}
dpsnprintf (str, sizeof(str), "playdemo %s\n", cls.demos[cls.demonum]);
- Cbuf_InsertText(&cmd_client, str);
+ Cbuf_InsertText(cmd_local, str);
cls.demonum++;
}
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;
}
/*
}
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_client); // 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)
// 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));
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 <demoname> : plays a demo\n");
- return;
- }
-
// open the demo file
- strlcpy (name, Cmd_Argv(cmd, 1), sizeof (name));
+ strlcpy (name, demo, sizeof (name));
FS_DefaultExtension (name, ".dem", sizeof (name));
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;
}
cls.demostarting = true;
// disconnect from server
- CL_Disconnect ();
- Host_ShutdownServer ();
+ CL_Disconnect();
// update networking ports (this is mainly just needed at startup)
NetConn_UpdateSockets();
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;
static int benchmark_runs = 0;
char vabuf[1024];
- cls.timedemo = false;
+ cls.timedemo = host.restless = false;
frames = cls.td_frames;
time = host.realtime - cls.td_starttime;
// 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");
+ i = Sys_CheckParm("-benchmarkruns");
if(i && i + 1 < sys.argc)
{
static benchmarkhistory_t *history = NULL;
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) \
}
Z_Free(history);
history = NULL;
- Host_Quit_f(&cmd_client);
+ host.state = host_shutdown;
}
}
else
- Host_Quit_f(&cmd_client);
+ host.state = host_shutdown;
}
}
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
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<c+1 ; i++)
+ strlcpy (cls.demos[i-1], Cmd_Argv(cmd, i), sizeof (cls.demos[i-1]));
+
+ // LadyHavoc: clear the remaining slots
+ for (;i <= MAX_DEMOS;i++)
+ cls.demos[i-1][0] = 0;
+
+ if (!sv.active && cls.demonum != -1 && !cls.demoplayback)
+ {
+ cls.demonum = 0;
+ CL_NextDemo ();
+ }
+ else
+ cls.demonum = -1;
+}
+
+
+/*
+==================
+CL_Demos_f
+
+Return to looping demos
+==================
+*/
+static void CL_Demos_f(cmd_state_t *cmd)
+{
+ if (cls.state == ca_dedicated)
+ return;
+ if (cls.demonum == -1)
+ cls.demonum = 1;
+ CL_Disconnect();
+ CL_NextDemo();
+}
+
+/*
+==================
+CL_Stopdemo_f
+
+Return to looping demos
+==================
+*/
+static void CL_Stopdemo_f(cmd_state_t *cmd)
+{
+ if (!cls.demoplayback)
+ return;
+ CL_Disconnect();
+}
+
+// LadyHavoc: pausedemo command
+static void CL_PauseDemo_f(cmd_state_t *cmd)
+{
+ cls.demopaused = !cls.demopaused;
+ if (cls.demopaused)
+ Con_Print("Demo paused\n");
+ else
+ Con_Print("Demo unpaused\n");
+}
+
+void CL_Demo_Init(void)
+{
+ Cmd_AddCommand(CF_CLIENT, "record", CL_Record_f, "record a demo");
+ Cmd_AddCommand(CF_CLIENT, "stop", CL_Stop_f, "stop recording or playing a demo");
+ Cmd_AddCommand(CF_CLIENT, "playdemo", CL_PlayDemo_f, "watch a demo file");
+ Cmd_AddCommand(CF_CLIENT, "timedemo", CL_TimeDemo_f, "play back a demo as fast as possible and save statistics to benchmark.log");
+ Cmd_AddCommand(CF_CLIENT, "startdemos", CL_Startdemos_f, "start playing back the selected demos sequentially (used at end of startup script)");
+ Cmd_AddCommand(CF_CLIENT, "demos", CL_Demos_f, "restart looping demos defined by the last startdemos command");
+ Cmd_AddCommand(CF_CLIENT, "stopdemo", CL_Stopdemo_f, "stop playing or recording demo (like stop command) and return to looping demos");
+ // LadyHavoc: added pausedemo
+ Cmd_AddCommand(CF_CLIENT, "pausedemo", CL_PauseDemo_f, "pause demo playback (can also safely pause demo recording if using QUAKE, QUAKEDP or NEHAHRAMOVIE protocol, useful for making movies)");
+ Cvar_RegisterVariable (&cl_autodemo);
+ Cvar_RegisterVariable (&cl_autodemo_nameformat);
+ Cvar_RegisterVariable (&cl_autodemo_delete);
+}
projects / xonotic / darkplaces.git / blobdiff