Killtarget teamchain cleanup crash fix

This commit is contained in:
BjossiAlfreds 2019-09-14 11:59:06 +00:00
parent 325910d2fe
commit fa063e9710
1 changed files with 8 additions and 12 deletions

View File

@ -269,7 +269,6 @@ G_UseTargets(edict_t *ent, edict_t *activator)
{ {
edict_t *t; edict_t *t;
edict_t *master; edict_t *master;
qboolean done = false;
if (!ent || !activator) if (!ent || !activator)
{ {
@ -322,20 +321,17 @@ G_UseTargets(edict_t *ent, edict_t *activator)
/* if this entity is part of a train, cleanly remove it */ /* if this entity is part of a train, cleanly remove it */
if (t->flags & FL_TEAMSLAVE) if (t->flags & FL_TEAMSLAVE)
{ {
if (t->teammaster) master = t->teammaster;
while (master)
{ {
master = t->teammaster; if (master->teamchain == t)
while (!done)
{ {
if (master->teamchain == t) master->teamchain = t->teamchain;
{ break;
master->teamchain = t->teamchain;
done = true;
}
master = master->teamchain;
} }
master = master->teamchain;
} }
} }