Merge branch 'maint'

This commit is contained in:
Christoph Oelckers 2013-08-12 20:42:21 +02:00
commit be1a00c537
10 changed files with 32 additions and 10 deletions

View file

@ -237,6 +237,9 @@ static FFlagDef ActorFlags[]=
DEFINE_FLAG(MF6, NOTONAUTOMAP, AActor, flags6),
DEFINE_FLAG(MF6, RELATIVETOFLOOR, AActor, flags6),
DEFINE_FLAG(MF7, NEVERTARGET, AActor, flags7),
DEFINE_FLAG(MF7, NOTELESTOMP, AActor, flags7),
// Effect flags
DEFINE_FLAG(FX, VISIBILITYPULSE, AActor, effects),
DEFINE_FLAG2(FX_ROCKET, ROCKETTRAIL, AActor, effects),