}
dpsnprintf (str, sizeof(str), "playdemo %s\n", cls.demos[cls.demonum]);
- Cbuf_InsertText(&cmd_client, 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;
-
}
/*
}
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)->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)
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));
+ 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();
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;
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
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
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