- moved RS_ bits to gamehud.h because that's all that uses these flags.

This commit is contained in:
Christoph Oelckers 2022-09-30 19:16:36 +02:00
parent 94b91f6ec3
commit 0eea776065
3 changed files with 21 additions and 27 deletions

View file

@ -41,32 +41,6 @@ enum
#define POINT2(i) (wall[wall[i].point2]) #define POINT2(i) (wall[wall[i].point2])
// rotatesprite 'orientation' (actually much more) bits
enum {
RS_TRANS1 = 1,
RS_AUTO = 2,
RS_YFLIP = 4,
RS_NOCLIP = 8,
RS_TOPLEFT = 16,
RS_TRANS2 = 32,
RS_NOMASK = 64,
RS_PERM = 128,
RS_ALIGN_L = 256,
RS_ALIGN_R = 512,
RS_ALIGN_MASK = 768,
RS_STRETCH = 1024,
RS_MODELSUBST= 4096,
// ROTATESPRITE_MAX-1 is the mask of all externally available orientation bits
ROTATESPRITE_MAX = 8192,
RS_XFLIPHUD = RS_YFLIP,
RS_YFLIPHUD = 16384, // this is for hud_drawsprite which uses RS_YFLIP for x-flipping but needs both flags
RS_CENTER = (1<<29), // proper center align.
RS_CENTERORIGIN = (1<<30),
};
#include "maptypes.h" #include "maptypes.h"
#include "clip.h" #include "clip.h"

View file

@ -6,3 +6,23 @@ extern F2DDrawer twodpsp;
void DrawRateStuff(); void DrawRateStuff();
void hud_drawsprite(double sx, double sy, double sz, double a, int picnum, int dashade, int dapalnum, int dastat, double alpha = 1); void hud_drawsprite(double sx, double sy, double sz, double a, int picnum, int dashade, int dapalnum, int dastat, double alpha = 1);
// orientation bits for hud_drawsprite.
enum {
RS_TRANS1 = 1,
RS_YFLIP = 4,
RS_TOPLEFT = 16,
RS_TRANS2 = 32,
RS_NOMASK = 64,
RS_ALIGN_L = 256,
RS_ALIGN_R = 512,
RS_ALIGN_MASK = 768,
RS_STRETCH = 1024,
RS_XFLIPHUD = RS_YFLIP,
RS_YFLIPHUD = 16384, // this is for hud_drawsprite which uses RS_YFLIP for x-flipping but needs both flags
RS_CENTER = (1 << 29), // proper center align.
};

View file

@ -325,7 +325,7 @@ class DukeStatusBar : DukeCommonStatusBar
/* /*
if (isShareware() && (ind > DukeWpn.HANDBOMB_WEAPON || ind < 0)) if (isShareware() && (ind > DukeWpn.HANDBOMB_WEAPON || ind < 0))
{ {
minitextshade(x + 1, y - 4, "ORDER", 20, 11, 2 + 8 + 16 + ROTATESPRITE_MAX); minitextshade(x + 1, y - 4, "ORDER", 20, 11, 2 + 8 + 16);
return; return;
} }
*/ */