Move WindowLeft, WindowRight, MirrorFlags to r_portal

This commit is contained in:
Magnus Norddahl 2017-01-03 19:25:00 +01:00
parent e25645df46
commit abdc7f9ff1
6 changed files with 8 additions and 6 deletions

View file

@ -44,6 +44,7 @@
#include "swrenderer/segments/r_drawsegment.h" #include "swrenderer/segments/r_drawsegment.h"
#include "swrenderer/scene/r_bsp.h" #include "swrenderer/scene/r_bsp.h"
#include "swrenderer/scene/r_3dfloors.h" #include "swrenderer/scene/r_3dfloors.h"
#include "swrenderer/scene/r_portal.h"
#include "swrenderer/line/r_walldraw.h" #include "swrenderer/line/r_walldraw.h"
#include "swrenderer/line/r_wallsetup.h" #include "swrenderer/line/r_wallsetup.h"

View file

@ -71,9 +71,6 @@ bool r_fakingunderwater;
static BYTE FakeSide; static BYTE FakeSide;
int WindowLeft, WindowRight;
WORD MirrorFlags;
visplane_t *floorplane; visplane_t *floorplane;
visplane_t *ceilingplane; visplane_t *ceilingplane;

View file

@ -46,9 +46,6 @@ enum
FAKED_AboveCeiling FAKED_AboveCeiling
}; };
extern int WindowLeft, WindowRight;
extern WORD MirrorFlags;
void R_RenderScene(); void R_RenderScene();
void R_RenderBSPNode (void *node); void R_RenderBSPNode (void *node);

View file

@ -62,6 +62,9 @@ CVAR(Bool, r_skyboxes, true, 0)
namespace swrenderer namespace swrenderer
{ {
int WindowLeft, WindowRight;
uint16_t MirrorFlags;
PortalDrawseg *CurrentPortal = nullptr; PortalDrawseg *CurrentPortal = nullptr;
int CurrentPortalUniq = 0; int CurrentPortalUniq = 0;
bool CurrentPortalInSkybox = false; bool CurrentPortalInSkybox = false;

View file

@ -17,6 +17,9 @@
namespace swrenderer namespace swrenderer
{ {
extern int WindowLeft, WindowRight;
extern uint16_t MirrorFlags;
extern PortalDrawseg* CurrentPortal; extern PortalDrawseg* CurrentPortal;
extern int CurrentPortalUniq; extern int CurrentPortalUniq;
extern bool CurrentPortalInSkybox; extern bool CurrentPortalInSkybox;

View file

@ -34,6 +34,7 @@
#include "swrenderer/scene/r_things.h" #include "swrenderer/scene/r_things.h"
#include "swrenderer/scene/r_3dfloors.h" #include "swrenderer/scene/r_3dfloors.h"
#include "swrenderer/scene/r_bsp.h" #include "swrenderer/scene/r_bsp.h"
#include "swrenderer/scene/r_portal.h"
#include "swrenderer/line/r_wallsetup.h" #include "swrenderer/line/r_wallsetup.h"
#include "swrenderer/line/r_walldraw.h" #include "swrenderer/line/r_walldraw.h"
#include "swrenderer/line/r_fogboundary.h" #include "swrenderer/line/r_fogboundary.h"