OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed incomplete commit for bounce flags

Browse source 
- fixed flag clearing in new function.
This commit is contained in:
Christoph Oelckers 2016-10-25 13:29:58 +02:00
commit 142278a818
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/scripting/thingdef_data.cpp
View file

@ -279,11 +279,7 @@ static FFlagDef ActorFlagDefs[]=
DEFINE_FLAG(RF, MASKROTATION, AActor, renderflags),
DEFINE_FLAG(RF, ABSMASKANGLE, AActor, renderflags),
DEFINE_FLAG(RF, ABSMASKPITCH, AActor, renderflags),
};
// These won't be accessible through bitfield variables
static FFlagDef MoreFlagDefs[] =
{
// Bounce flags
DEFINE_FLAG2(BOUNCE_Walls, BOUNCEONWALLS, AActor, BounceFlags),
DEFINE_FLAG2(BOUNCE_Floors, BOUNCEONFLOORS, AActor, BounceFlags),
@ -299,6 +295,11 @@ static FFlagDef MoreFlagDefs[] =
DEFINE_FLAG2(BOUNCE_MBF, MBFBOUNCER, AActor, BounceFlags),
DEFINE_FLAG2(BOUNCE_AutoOffFloorOnly, BOUNCEAUTOOFFFLOORONLY, AActor, BounceFlags),
DEFINE_FLAG2(BOUNCE_UseBounceState, USEBOUNCESTATE, AActor, BounceFlags),
};
// These won't be accessible through bitfield variables
static FFlagDef MoreFlagDefs[] =
{
// Deprecated flags. Handling must be performed in HandleDeprecatedFlags
DEFINE_DEPRECATED_FLAG(FIREDAMAGE),