fix SUB_UseTargets so it doesn't wind up nuking everything

This commit is contained in:
Bill Currie 2002-04-27 00:40:11 +00:00
parent 5a29efb8e2
commit 1d74a0e909
2 changed files with 8 additions and 3 deletions

View File

@ -179,9 +179,11 @@ void() SUB_CalcAngleMoveDone =
void() DelayThink =
{
local integer rem = self.killtarget != self.targetname;
activator = self.enemy;
SUB_UseTargets ();
dremove(self);
if (rem)
dremove(self);
};
/*
@ -252,10 +254,11 @@ void() SUB_UseTargets =
// kill the killtagets
if (self.killtarget)
{
local string kt = self.killtarget;
t = NIL;
do
{
t = find (t, targetname, self.killtarget);
t = find (t, targetname, kt);
if (!t)
return;
remove (t);

View File

@ -629,9 +629,11 @@ void() trigger_onlyregistered_touch =
self.attack_finished = time + 2;
if (cvar("registered"))
{
local integer rem = self.targetname != self.killtarget;
self.message = "";
SUB_UseTargets ();
remove (self);
if (rem)
remove (self);
}
else
{