yquake2/rogue
0
0
Fork 0
mirror of https://github.com/yquake2/rogue.git synced 2024-11-29 07:22:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #24 from BjossiAlfreds/usetargets-crash-fix

Browse source 
Killtarget teamchain cleanup crash fix
This commit is contained in:
Yamagi 2019-09-15 09:28:04 +02:00 committed by GitHub
commit 120e4684d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/g_utils.c
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;
} }
} }