mirror of
https://git.code.sf.net/p/quake/game-source
synced 2024-11-22 03:51:12 +00:00
more SUB_UseTargets fixes and a trailing \n
This commit is contained in:
parent
59ec64557a
commit
ec46bd7cb7
5 changed files with 17 additions and 7 deletions
|
@ -183,9 +183,11 @@ void() SUB_CalcAngleMoveDone =
|
|||
|
||||
void() DelayThink =
|
||||
{
|
||||
local float rem = self.killtarget != self.targetname;
|
||||
activator = self.enemy;
|
||||
SUB_UseTargets ();
|
||||
remove(self);
|
||||
if (rem)
|
||||
remove(self);
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -245,10 +247,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);
|
||||
|
|
|
@ -520,9 +520,11 @@ void() trigger_onlyregistered_touch =
|
|||
self.attack_finished = time + 2;
|
||||
if (cvar("registered"))
|
||||
{
|
||||
local float rem = self.targetname != self.killtarget;
|
||||
self.message = "";
|
||||
SUB_UseTargets ();
|
||||
remove (self);
|
||||
if (rem)
|
||||
remove (self);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -74,4 +74,4 @@ void() path_corner =
|
|||
{
|
||||
movetarget_f ();
|
||||
};
|
||||
//============================================================================
|
||||
//============================================================================
|
||||
|
|
|
@ -152,9 +152,11 @@ void() SUB_CalcAngleMoveDone =
|
|||
//=============================================================================
|
||||
void() DelayThink =
|
||||
{
|
||||
local integer rem = self.killtarget != self.targetname;
|
||||
activator = self.enemy;
|
||||
SUB_UseTargets ();
|
||||
remove(self);
|
||||
if (rem)
|
||||
remove(self);
|
||||
};
|
||||
/*
|
||||
==============================
|
||||
|
@ -206,10 +208,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);
|
||||
|
|
|
@ -441,9 +441,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
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue