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

more SUB_UseTargets fixes and a trailing \n

Browse source
This commit is contained in:
Bill Currie 2002-04-26 20:10:46 +00:00
parent 59ec64557a
commit ec46bd7cb7
5 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
paroxysm/quake/subs.qc
View file

@ -183,9 +183,11 @@ void() SUB_CalcAngleMoveDone =
void() DelayThink = void() DelayThink =
{ {
local float rem = self.killtarget != self.targetname;
activator = self.enemy; activator = self.enemy;
SUB_UseTargets (); SUB_UseTargets ();
remove(self); if (rem)
remove(self);
}; };
/* /*
@ -245,10 +247,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
paroxysm/quake/triggers.qc
View file

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

7
paroxysm/quakeworld/subs.qc
View file

@ -152,9 +152,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);
}; };
/* /*
============================== ==============================
@ -206,10 +208,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
paroxysm/quakeworld/triggers.qc
View file

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