An attempted ktpro fix
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1577 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
cdb82f3316
commit
9e89e2273a
1 changed files with 15 additions and 2 deletions
|
@ -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.
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue