From 14ca635dc164f803c8534f0b712b2e6e02a40519 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 9 Feb 2017 15:45:35 +0200 Subject: [PATCH] Fixed clashing of actor render flags' values Sorted definitions in ascending order of values See https://mantis.zdoom.org/view.php?id=204 --- src/actor.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/actor.h b/src/actor.h index 13511b617..42689310b 100644 --- a/src/actor.h +++ b/src/actor.h @@ -417,7 +417,8 @@ enum ActorRenderFlag RF_FLATSPRITE = 0x2000, // Flat sprite RF_VOXELSPRITE = 0x3000, // Voxel object RF_INVISIBLE = 0x8000, // Don't bother drawing this actor - RF_MAYBEINVISIBLE = 0x10000, + RF_FORCEYBILLBOARD = 0x10000, // [BB] OpenGL only: draw with y axis billboard, i.e. anchored to the floor (overrides gl_billboard_mode setting) + RF_FORCEXYBILLBOARD = 0x20000, // [BB] OpenGL only: draw with xy axis billboard, i.e. unanchored (overrides gl_billboard_mode setting) RF_ROLLSPRITE = 0x40000, //[marrub]roll the sprite billboard RF_DONTFLIP = 0x80000, // Don't flip it when viewed from behind. RF_ROLLCENTER = 0x00100000, // Rotate from the center of sprite instead of offsets @@ -425,9 +426,7 @@ enum ActorRenderFlag RF_ABSMASKANGLE = 0x00400000, // [MC] The mask rotation does not offset by the actor's angle. RF_ABSMASKPITCH = 0x00800000, // [MC] The mask rotation does not offset by the actor's pitch. RF_INTERPOLATEANGLES = 0x01000000, // [MC] Allow interpolation of the actor's angle, pitch and roll. - - RF_FORCEYBILLBOARD = 0x10000, // [BB] OpenGL only: draw with y axis billboard, i.e. anchored to the floor (overrides gl_billboard_mode setting) - RF_FORCEXYBILLBOARD = 0x20000, // [BB] OpenGL only: draw with xy axis billboard, i.e. unanchored (overrides gl_billboard_mode setting) + RF_MAYBEINVISIBLE = 0x02000000, }; // This translucency value produces the closest match to Heretic's TINTTAB.