zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fixed: A_RemoveSiblings and A_KillSiblings did not check that the caller had a master to deduce siblings from. 

SVN r4237 (trunk)
This commit is contained in:
Randy Heit 2013-04-30 02:46:47 +00:00
parent f7aa019f85
commit 5dc034c2ed
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/thingdef/thingdef_codeptr.cpp
View File

@ -3780,11 +3780,14 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_RemoveSiblings)
ACTION_PARAM_START(1);
ACTION_PARAM_BOOL(removeall,0);
while ((mo = it.Next()) != NULL)
if (self->master != NULL)
{
if (mo->master == self->master && mo != self && (mo->health <= 0 || removeall))
while ((mo = it.Next()) != NULL)
{
P_RemoveThing(mo);
if (mo->master == self->master && mo != self && (mo->health <= 0 || removeall))
{
P_RemoveThing(mo);
}
}
}
}
@ -3831,11 +3834,14 @@ DEFINE_ACTION_FUNCTION(AActor, A_RaiseSiblings)
TThinkerIterator<AActor> it;
AActor *mo;
while ((mo = it.Next()) != NULL)
if (self->master != NULL)
{
if (mo->master == self->master && mo != self)
while ((mo = it.Next()) != NULL)
{
P_Thing_Raise(mo);
if (mo->master == self->master && mo != self)
{
P_Thing_Raise(mo);
}
}
}
}