OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'hitpointer2' of https://github.com/MajorCooke/zdoom

Browse source 
Conflicts:
	src/actor.h
	src/thingdef/thingdef_data.cpp
This commit is contained in:
Christoph Oelckers 2014-12-10 11:48:32 +01:00
commit 6afe9cc048
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/thingdef/thingdef_data.cpp
View file

@ -250,6 +250,9 @@ static FFlagDef ActorFlags[]=
DEFINE_FLAG(MF7, THRUREFLECT, AActor, flags7),
DEFINE_FLAG(MF7, MIRRORREFLECT, AActor, flags7),
DEFINE_FLAG(MF7, AIMREFLECT, AActor, flags7),
DEFINE_FLAG(MF7, HITTARGET, AActor, flags7),
DEFINE_FLAG(MF7, HITMASTER, AActor, flags7),
DEFINE_FLAG(MF7, HITTRACER, AActor, flags7),
// Effect flags
DEFINE_FLAG(FX, VISIBILITYPULSE, AActor, effects),