nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-26 13:50:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

This caused a crash (and a little something else that qtv uses).

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2454 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2007-01-06 09:36:38 +00:00
parent 9df6d335e4
commit 88388accb2
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/client/cl_parse.c
View file

@ -868,7 +868,7 @@ void CL_RequestNextDownload (void)
else else
#endif #endif
{ {
if (cl.worldmodel->needload) if (!cl.worldmodel || cl.worldmodel->needload)
{ {
Con_Printf("\n\n-------------\nCouldn't download %s - cannot fully connect\n", cl.worldmodel->name); Con_Printf("\n\n-------------\nCouldn't download %s - cannot fully connect\n", cl.worldmodel->name);
return; return;
@ -3726,6 +3726,16 @@ void CL_ParseStuffCmd(char *msg, int destsplit) //this protects stuffcmds from n
Cbuf_AddText ("\n", RESTRICT_SERVER+destsplit); Cbuf_AddText ("\n", RESTRICT_SERVER+destsplit);
} }
} }
else if (!strncmp(stufftext, "//exectrigger ", 14))
{
COM_Parse(stufftext + 14);
if (Cmd_AliasExist(com_token, RESTRICT_SERVER))
Cmd_ExecuteString(com_token, RESTRICT_SERVER); //do this NOW so that it's done before any models or anything are loaded
}
else if (!strncmp(stufftext, "//set ", 6))
{
Cmd_ExecuteString(stufftext+2, RESTRICT_SERVER+destsplit); //do this NOW so that it's done before any models or anything are loaded
}
else else
#ifdef CSQC_DAT #ifdef CSQC_DAT
if (!CSQC_StuffCmd(stufftext)) if (!CSQC_StuffCmd(stufftext))