zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- A_KIllSiblings and A_DamageSiblings didn't check for a valid master.

Browse source 
SVN r4242 (trunk)
This commit is contained in:
Christoph Oelckers 2013-04-30 06:48:53 +00:00
parent e9cd2777f3
commit bed47c6eff
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/thingdef/thingdef_codeptr.cpp
View file

@ -2608,11 +2608,14 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_KillSiblings)
TThinkerIterator<AActor> it;
AActor *mo;
while ( (mo = it.Next()) )
if (self->master != NULL)
{
if (mo->master == self->master && mo != self)
while ( (mo = it.Next()) )
{
P_DamageMobj(mo, self, self, mo->health, damagetype, DMG_NO_ARMOR | DMG_NO_FACTOR);
if (mo->master == self->master && mo != self)
{
P_DamageMobj(mo, self, self, mo->health, damagetype, DMG_NO_ARMOR | DMG_NO_FACTOR);
}
}
}
}
@ -3501,18 +3504,21 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_DamageSiblings)
ACTION_PARAM_INT(amount, 0);
ACTION_PARAM_NAME(DamageType, 1);
while ( (mo = it.Next()) )
if (self->master != NULL)
{
if (mo->master == self->master && mo != self)
while ( (mo = it.Next()) )
{
if (amount > 0)
if (mo->master == self->master && mo != self)
{
P_DamageMobj(mo, self, self, amount, DamageType, DMG_NO_ARMOR);
}
else if (amount < 0)
{
amount = -amount;
P_GiveBody(mo, amount);
if (amount > 0)
{
P_DamageMobj(mo, self, self, amount, DamageType, DMG_NO_ARMOR);
}
else if (amount < 0)
{
amount = -amount;
P_GiveBody(mo, amount);
}
}
}
}