From 9e89e2273a42573c960b7ba32ed88c85a4915b8b Mon Sep 17 00:00:00 2001 From: Spoike Date: Mon, 21 Nov 2005 21:46:52 +0000 Subject: [PATCH] An attempted ktpro fix git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1577 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/server/pr_cmds.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/engine/server/pr_cmds.c b/engine/server/pr_cmds.c index 5b0fd72ab..9e36801d1 100644 --- a/engine/server/pr_cmds.c +++ b/engine/server/pr_cmds.c @@ -180,9 +180,16 @@ pbool ED_CanFree (edict_t *ed) VectorCopy (vec3_origin, ed->v->origin); VectorCopy (vec3_origin, ed->v->angles); ed->v->nextthink = 0; - ed->v->think = 0; ed->v->solid = 0; + if (pr_imitatemvdsv.value) + { + ed->v->classname = 0; + ed->v->health = 0; + } + else + ed->v->think = 0; + ed->v->SendEntity = 0; sv.csqcentversion[ed->entnum] = ed->v->Version+1; @@ -320,7 +327,11 @@ int QCEditor (progfuncs_t *prinst, char *filename, int line, int nump, char **pa if (line == -1) return -1; - COM_FOpenFile(filename, &f); + SV_EndRedirect(); + if (developer.value) + COM_FOpenFile(filename, &f); + else + f = NULL; //faster. if (!f) Con_Printf("%s - %i\n", filename, line); else @@ -3453,6 +3464,8 @@ void PF_Remove (progfuncs_t *prinst, struct globalvars_s *pr_globals) if (ed->isfree && progstype != PROG_H2) //h2 is dire... { + ED_CanFree(ed); + Con_DPrintf("Tried removing free entity\n"); return; //yeah, alright, so this is hacky. }