zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 12:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added MTF_NOCOUNT to spawn flags

Browse source
This commit is contained in:
PaulyB 2020-04-24 19:16:06 -07:00 committed by Christoph Oelckers
parent 994550fb00
commit 573b2958c6
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/doomdata.h
View file

@ -418,6 +418,7 @@ enum EMapThingFlags
MTF_SECRET = 0x080000, // Secret pickup MTF_SECRET = 0x080000, // Secret pickup
MTF_NOINFIGHTING = 0x100000, MTF_NOINFIGHTING = 0x100000,
MTF_NOCOUNT = 0x200000, // Removes COUNTKILL/COUNTITEM
// BOOM and DOOM compatible versions of some of the above // BOOM and DOOM compatible versions of some of the above

13
src/playsim/p_mobj.cpp
View file

@ -4664,6 +4664,19 @@ void AActor::HandleSpawnFlags ()
Level->total_secrets++; Level->total_secrets++;
} }
} }
if (SpawnFlags & MTF_NOCOUNT)
{
if (flags & MF_COUNTKILL)
{
flags &= ~MF_COUNTKILL;
Level->total_monsters--;
}
if (flags & MF_COUNTITEM)
{
flags &= ~MF_COUNTITEM;
Level->total_items--;
}
}
} }
DEFINE_ACTION_FUNCTION(AActor, HandleSpawnFlags) DEFINE_ACTION_FUNCTION(AActor, HandleSpawnFlags)

1
wadsrc/static/zscript/constants.zs
View file

@ -997,6 +997,7 @@ enum EMapThingFlags
MTF_SECRET = 0x080000, // Secret pickup MTF_SECRET = 0x080000, // Secret pickup
MTF_NOINFIGHTING = 0x100000, MTF_NOINFIGHTING = 0x100000,
MTF_NOCOUNT = 0x200000, // Removes COUNTKILL/COUNTITEM
}; };
enum ESkillProperty enum ESkillProperty