Move engine variables not managed by polymost.cpp to engine.cpp

This commit is contained in:
Magnus Norddahl 2020-01-28 22:41:07 +01:00
parent ba23ebdc0f
commit 113c0d8b34
2 changed files with 11 additions and 15 deletions

View file

@ -87,6 +87,17 @@ static FORCE_INLINE int32_t oldnonpow2(void)
#endif #endif
} }
bool playing_rr;
bool playing_blood;
int32_t rendmode=0;
int32_t glrendmode = REND_POLYMOST;
int32_t r_scenebrightness = 0;
int32_t r_rortexture = 0;
int32_t r_rortexturerange = 0;
int32_t r_rorphase = 0;
int32_t mdtims, omdtims;
uint8_t alphahackarray[MAXTILES];
uint8_t globalr = 255, globalg = 255, globalb = 255; uint8_t globalr = 255, globalg = 255, globalb = 255;
int16_t pskybits_override = -1; int16_t pskybits_override = -1;

View file

@ -63,12 +63,6 @@ CUSTOM_CVARD(Int, hw_anisotropy, 4, CVAR_ARCHIVE | CVAR_GLOBALCONFIG, "changes t
// For testing - will be removed later. // For testing - will be removed later.
CVAR(Int, skytile, 0, 0) CVAR(Int, skytile, 0, 0)
bool playing_rr;
bool playing_blood;
int32_t rendmode=0;
typedef struct { float x, cy[2], fy[2]; int32_t tag; int16_t n, p, ctag, ftag; } vsptyp; typedef struct { float x, cy[2], fy[2]; int32_t tag; int16_t n, p, ctag, ftag; } vsptyp;
#define VSPMAX 2048 //<- careful! #define VSPMAX 2048 //<- careful!
static vsptyp vsp[VSPMAX]; static vsptyp vsp[VSPMAX];
@ -120,13 +114,6 @@ static int32_t drawpoly_srepeat = 0, drawpoly_trepeat = 0;
static int32_t lastglpolygonmode = 0; //FUK static int32_t lastglpolygonmode = 0; //FUK
static FHardwareTexture *polymosttext = 0; static FHardwareTexture *polymosttext = 0;
int32_t glrendmode = REND_POLYMOST;
int32_t r_scenebrightness = 0;
int32_t r_rortexture = 0;
int32_t r_rortexturerange = 0;
int32_t r_rorphase = 0;
static int32_t r_yshearing = 0; static int32_t r_yshearing = 0;
@ -144,8 +131,6 @@ static int32_t r_parallaxskyclamping = 1;
#define Bfabsf fabsf #define Bfabsf fabsf
int32_t mdtims, omdtims;
uint8_t alphahackarray[MAXTILES];
static int32_t drawingskybox = 0; static int32_t drawingskybox = 0;
static int32_t hicprecaching = 0; static int32_t hicprecaching = 0;