From 88388accb262f3da7e82e9bf1619b41c0dc10e0d Mon Sep 17 00:00:00 2001 From: Spoike Date: Sat, 6 Jan 2007 09:36:38 +0000 Subject: [PATCH] This caused a crash (and a little something else that qtv uses). git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2454 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cl_parse.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/engine/client/cl_parse.c b/engine/client/cl_parse.c index 45143479d..3365fa610 100644 --- a/engine/client/cl_parse.c +++ b/engine/client/cl_parse.c @@ -868,7 +868,7 @@ void CL_RequestNextDownload (void) else #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); return; @@ -3726,6 +3726,16 @@ void CL_ParseStuffCmd(char *msg, int destsplit) //this protects stuffcmds from n 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 #ifdef CSQC_DAT if (!CSQC_StuffCmd(stufftext))