zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-21 19:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed: MBF21's flag functions did not call the special wrappers for MF_FRIENDLY.

Browse source
This commit is contained in:
Christoph Oelckers 2024-10-03 23:01:09 +02:00
parent b667b930a3
commit 6aa71184f7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gamedata/d_dehacked.cpp
View file

@ -3961,6 +3961,7 @@ void SetFriendly(AActor* a)
{
if (a->CountsAsKill() && a->health > 0) a->Level->total_monsters--;
a->flags |= MF_FRIENDLY;
a->flags3 |= MF3_NOBLOCKMONST;
if (a->CountsAsKill() && a->health > 0) a->Level->total_monsters++;
}
@ -3968,6 +3969,7 @@ void ClearFriendly(AActor* a)
{
if (a->CountsAsKill() && a->health > 0) a->Level->total_monsters--;
a->flags &= ~MF_FRIENDLY;
a->flags3 &= ~MF3_NOBLOCKMONST;
if (a->CountsAsKill() && a->health > 0) a->Level->total_monsters++;
}
@ -4123,7 +4125,7 @@ static FlagHandler flag1handlers[32] = {
{ SetTranslation2, ClearTranslation2, CheckTranslation2 },
F6(MF6_TOUCHY),
{ SetBounces, ClearBounces, [](AActor* a)->bool { return a->BounceFlags & BOUNCE_DEH; } },
F(MF_FRIENDLY),
{ SetFriendly, ClearFriendly, [](AActor* a)->bool { return a->flags & MF_FRIENDLY; } },
{ SetTranslucent, ClearTranslucent, CheckTranslucent },
};