hopefully fix 3 entity leaks

This commit is contained in:
Bill Currie 2002-08-21 20:25:10 +00:00
parent 1afd36dc3d
commit 7c3dcf1d31
3 changed files with 5 additions and 4 deletions

View file

@ -959,8 +959,10 @@ void() player_die_ax1;
void() DeathBubblesSpawn = void() DeathBubblesSpawn =
{ {
if (self.owner.waterlevel != 3 && self.has_holo == 0) if (self.owner.waterlevel != 3 && self.has_holo == 0) {
dremove(self);
return; return;
}
newmis = spawn(); newmis = spawn();
setmodel (newmis, "progs/s_bubble.spr"); setmodel (newmis, "progs/s_bubble.spr");
setorigin (newmis, self.owner.origin + '0 0 24'); setorigin (newmis, self.owner.origin + '0 0 24');

View file

@ -198,7 +198,6 @@ void(entity ignore, string st, string st2, string st3, string st4, string st5, s
void() ThrowC4Det = void() ThrowC4Det =
{ {
local entity user; local entity user;
local entity oldself;
self.owner.is_toffingadet = 0; self.owner.is_toffingadet = 0;
@ -253,7 +252,7 @@ void() ThrowC4Det =
setsize (newmis, '-16 -16 -8', '16 16 8'); setsize (newmis, '-16 -16 -8', '16 16 8');
setorigin (newmis, user.origin); setorigin (newmis, user.origin);
oldself = self; dremove (self);
self = user; self = user;
#ifdef DEMO_STUFF #ifdef DEMO_STUFF

View file

@ -179,7 +179,7 @@ void() SUB_CalcAngleMoveDone =
void() DelayThink = void() DelayThink =
{ {
local integer rem = self.killtarget != self.targetname; local integer rem = !self.killtarget || self.killtarget != self.targetname;
activator = self.enemy; activator = self.enemy;
SUB_UseTargets (); SUB_UseTargets ();
if (rem) if (rem)