bring in the killtarget fixes from quakeworld

This commit is contained in:
Bill Currie 2002-10-24 19:57:00 +00:00
parent a46b5eb518
commit c1d3e4f3be
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 ();
remove(self);
if (rem)
remove(self);
};
/*
@ -240,10 +242,11 @@ void() SUB_UseTargets =
//
if (self.killtarget)
{
local string kt = self.killtarget;
t = world;
do
{
t = find (t, targetname, self.killtarget);
t = find (t, targetname, kt);
if (!t)
return;
remove (t);

View file

@ -530,9 +530,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
{