OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/DaZombieKiller/zdoom

Browse source 
Conflicts:
	src/actor.h
This commit is contained in:
Christoph Oelckers 2015-04-30 09:14:31 +02:00
commit 405fc31e81
5 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/thingdef/thingdef_data.cpp
View file

@ -253,6 +253,10 @@ static FFlagDef ActorFlags[]=
DEFINE_FLAG(MF7, HITTARGET, AActor, flags7),
DEFINE_FLAG(MF7, HITMASTER, AActor, flags7),
DEFINE_FLAG(MF7, HITTRACER, AActor, flags7),
// [ZK] Decal flags
DEFINE_FLAG(MF7, NODECAL, AActor, flags7),
DEFINE_FLAG(MF7, FORCEDECAL, AActor, flags7),
// Effect flags
DEFINE_FLAG(FX, VISIBILITYPULSE, AActor, effects),