X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_demo.c;h=beab8f84ed84354dc28d5f813e3a77ae4b13895b;hp=b8445419514a6fcaab6394828c46f86319edde8a;hb=8bbbfbd93eee3aaa0532de92be084d9fcb831d4e;hpb=7b56e23b2643937f50c60105c2c1333c0f00034a diff --git a/cl_demo.c b/cl_demo.c index b8445419..beab8f84 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_local, 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; } /* @@ -257,9 +256,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 +273,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_local)->cbuf); // immediately execute svc_stufftext if in the demo before connect! // In case the demo contains a "svc_disconnect" message if (!cls.demoplayback) @@ -382,7 +380,7 @@ 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); @@ -402,29 +400,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)); + strlcpy (name, demo, sizeof (name)); FS_DefaultExtension (name, ".dem", sizeof (name)); f = FS_OpenVirtualFile(name, false); if (!f) @@ -437,8 +421,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(); @@ -465,6 +448,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; @@ -510,10 +511,10 @@ 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"); + i = Sys_CheckParm("-benchmarkruns"); if(i && i + 1 < sys.argc) { static benchmarkhistory_t *history = NULL; @@ -530,13 +531,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,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; } } @@ -604,7 +605,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 @@ -637,7 +638,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; @@ -678,8 +679,8 @@ static void CL_Demos_f(cmd_state_t *cmd) return; if (cls.demonum == -1) cls.demonum = 1; - CL_Disconnect_f (cmd); - CL_NextDemo (); + CL_Disconnect(); + CL_NextDemo(); } /* @@ -693,8 +694,7 @@ static void CL_Stopdemo_f(cmd_state_t *cmd) { if (!cls.demoplayback) return; - CL_Disconnect (); - SV_Shutdown (); + CL_Disconnect(); } // LadyHavoc: pausedemo command @@ -709,15 +709,15 @@ static void CL_PauseDemo_f(cmd_state_t *cmd) void CL_Demo_Init(void) { - Cmd_AddCommand(CMD_CLIENT, "record", CL_Record_f, "record a demo"); - Cmd_AddCommand(CMD_CLIENT, "stop", CL_Stop_f, "stop recording or playing a demo"); - Cmd_AddCommand(CMD_CLIENT, "playdemo", CL_PlayDemo_f, "watch a demo file"); - Cmd_AddCommand(CMD_CLIENT, "timedemo", CL_TimeDemo_f, "play back a demo as fast as possible and save statistics to benchmark.log"); - Cmd_AddCommand(CMD_CLIENT, "startdemos", CL_Startdemos_f, "start playing back the selected demos sequentially (used at end of startup script)"); - Cmd_AddCommand(CMD_CLIENT, "demos", CL_Demos_f, "restart looping demos defined by the last startdemos command"); - Cmd_AddCommand(CMD_CLIENT, "stopdemo", CL_Stopdemo_f, "stop playing or recording demo (like stop command) and return to looping demos"); + 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(CMD_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)"); + 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);