zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-23 12:32:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: fix enemy counting

Browse source
This commit is contained in:
Christoph Oelckers 2023-08-06 09:22:20 +02:00
parent f0623c7098
commit 76e77d4e64
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/duke/src/game.cpp
View file

@ -492,9 +492,9 @@ void GameInterface::FinalizeSetup()
{ {
auto def = static_cast<DDukeActor*>(GetDefaultByType(cls)); auto def = static_cast<DDukeActor*>(GetDefaultByType(cls));
auto fb = (SFLAG_BADGUY | SFLAG_KILLCOUNT | SFLAG_BADGUYSTAYPUT); auto fb = (SFLAG_BADGUY | SFLAG_KILLCOUNT | SFLAG_BADGUYSTAYPUT);
auto check = (def->flags1 & (SFLAG_BADGUY | SFLAG_KILLCOUNT)); auto check = (def->flags1 & (SFLAG_INTERNAL_BADGUY | SFLAG_BADGUY | SFLAG_KILLCOUNT));
// do not enable KILLCOUNT if it the base is a non-counting badguy. This is needed for RR's animals. // do not enable KILLCOUNT if it the base is a non-counting badguy. This is needed for RR's animals.
if (check == EDukeFlags1::FromInt(SFLAG_BADGUY)) fb &= ~SFLAG_KILLCOUNT; if ((check & (SFLAG_BADGUY | SFLAG_INTERNAL_BADGUY)) && !(check & SFLAG_KILLCOUNT)) fb &= ~SFLAG_KILLCOUNT;
def->flags1 = (def->flags1 & ~fb) | (actinf.enemyflags & fb); def->flags1 = (def->flags1 & ~fb) | (actinf.enemyflags & fb);
if (def->flags1 & SFLAG_KILLCOUNT) def->flags1 |= SFLAG_SKILLFILTER; if (def->flags1 & SFLAG_KILLCOUNT) def->flags1 |= SFLAG_SKILLFILTER;
} }