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

- fixed: AActor::Masacre must restore the flag if it cannot kill the monster.

Browse source
This commit is contained in:
Christoph Oelckers 2016-10-01 12:08:07 +02:00
parent 099bfed806
commit 7720359f4c
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_mobj.cpp
View file

@ -1323,6 +1323,9 @@ bool AActor::Massacre ()
if (health > 0) if (health > 0)
{ {
auto f = flags;
auto f2 = flags2;
flags |= MF_SHOOTABLE; flags |= MF_SHOOTABLE;
flags2 &= ~(MF2_DORMANT|MF2_INVULNERABLE); flags2 &= ~(MF2_DORMANT|MF2_INVULNERABLE);
do do
@ -1331,6 +1334,12 @@ bool AActor::Massacre ()
P_DamageMobj (this, NULL, NULL, TELEFRAG_DAMAGE, NAME_Massacre); P_DamageMobj (this, NULL, NULL, TELEFRAG_DAMAGE, NAME_Massacre);
} }
while (health != prevhealth && health > 0); //abort if the actor wasn't hurt. while (health != prevhealth && health > 0); //abort if the actor wasn't hurt.
if (health > 0)
{
// restore flags if this did not kill the monster.
flags = f;
flags2 = f2;
}
return health <= 0; return health <= 0;
} }
return false; return false;