if (!cls.demostarting) // only quit if not starting another demo
if (Sys_CheckParm("-demo") || Sys_CheckParm("-capturedemo"))
- Host_Quit_f(&cmd_client);
-
+ host.state = host_shutdown;
}
/*
====================
CL_PlayDemo_f
-play [demoname]
+playdemo [demoname]
====================
*/
void CL_PlayDemo_f(cmd_state_t *cmd)
{
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");
+ Con_Print("playdemo <demoname> : plays a demo\n");
return;
}
cls.demostarting = true;
// disconnect from server
- CL_Disconnect ();
- SV_Shutdown ();
+ if(cls.state == ca_connected)
+ CL_Disconnect();
+ if(sv.active)
+ SV_Shutdown();
// update networking ports (this is mainly just needed at startup)
NetConn_UpdateSockets();
}
Z_Free(history);
history = NULL;
- Host_Quit_f(&cmd_client);
+ host.state = host_shutdown;
}
}
else
- Host_Quit_f(&cmd_client);
+ host.state = host_shutdown;
}
}
{
if (!cls.demoplayback)
return;
- CL_Disconnect ();
- SV_Shutdown ();
+ CL_Disconnect();
}
// LadyHavoc: pausedemo command
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);