mirror of
https://git.code.sf.net/p/quake/game-source
synced 2025-04-15 20:24:36 +00:00
subs.qc:
make sure self.killtarget doesn't get nuked with sv_old_entity_free 0 and self.targetname == self.killtarget triggers.qc: don't remeve self if self.targetname == self.killtarget (I suspect this is /always/ the case, but no harm in being certain).
This commit is contained in:
parent
60675de584
commit
dcbb64cfe7
2 changed files with 5 additions and 2 deletions
quakeworld
|
@ -240,10 +240,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);
|
||||
|
|
|
@ -511,9 +511,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