Merged p_setup conflict
This commit is contained in:
commit
6a0103a746
54 changed files with 191 additions and 779 deletions
|
|
@ -326,6 +326,7 @@ static FFlagDef ActorFlagDefs[]=
|
|||
DEFINE_FLAG(RF, ABSMASKPITCH, AActor, renderflags),
|
||||
DEFINE_FLAG(RF, XFLIP, AActor, renderflags),
|
||||
DEFINE_FLAG(RF, YFLIP, AActor, renderflags),
|
||||
DEFINE_FLAG(RF, INTERPOLATEANGLES, AActor, renderflags),
|
||||
|
||||
// Bounce flags
|
||||
DEFINE_FLAG2(BOUNCE_Walls, BOUNCEONWALLS, AActor, BounceFlags),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue