qf/game-source
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/game-source synced 2024-11-22 12:01:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

bring in the killtarget fixes from quakeworld

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nqw/subs.qc
View file

@ -179,9 +179,11 @@ void() SUB_CalcAngleMoveDone =
void() DelayThink = void() DelayThink =
{ {
local integer rem = self.killtarget != self.targetname;
activator = self.enemy; activator = self.enemy;
SUB_UseTargets (); SUB_UseTargets ();
remove(self); if (rem)
remove(self);
}; };
/* /*
@ -240,10 +242,11 @@ void() SUB_UseTargets =
// //
if (self.killtarget) if (self.killtarget)
{ {
local string kt = self.killtarget;
t = world; t = world;
do do
{ {
t = find (t, targetname, self.killtarget); t = find (t, targetname, kt);
if (!t) if (!t)
return; return;
remove (t); remove (t);

4
nqw/triggers.qc
View file

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