- Fixed compile errors with last merge.

This commit is contained in:
Rachael Alexanderson 2017-01-09 10:16:24 -05:00
parent 05662e5c4d
commit 6c04439315
5 changed files with 6 additions and 1 deletions

View file

@ -27,6 +27,7 @@
#include "poly_sky.h" #include "poly_sky.h"
#include "poly_portal.h" #include "poly_portal.h"
#include "r_sky.h" // for skyflatnum #include "r_sky.h" // for skyflatnum
#include "g_levellocals.h"
PolySkyDome::PolySkyDome() PolySkyDome::PolySkyDome()
{ {

View file

@ -41,6 +41,7 @@
#include "swrenderer/line/r_walldraw.h" #include "swrenderer/line/r_walldraw.h"
#include "swrenderer/scene/r_portal.h" #include "swrenderer/scene/r_portal.h"
#include "swrenderer/r_memory.h" #include "swrenderer/r_memory.h"
#include "g_levellocals.h"
CVAR(Bool, r_linearsky, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); CVAR(Bool, r_linearsky, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
EXTERN_CVAR(Int, r_skymode) EXTERN_CVAR(Int, r_skymode)
@ -115,7 +116,7 @@ namespace swrenderer
else else
{ // MBF's linedef-controlled skies { // MBF's linedef-controlled skies
// Sky Linedef // Sky Linedef
const line_t *l = &lines[(pl->sky & ~PL_SKYFLAT) - 1]; const line_t *l = &level.lines[(pl->sky & ~PL_SKYFLAT) - 1];
// Sky transferred from first sidedef // Sky transferred from first sidedef
const side_t *s = l->sidedef[0]; const side_t *s = l->sidedef[0];

View file

@ -54,6 +54,7 @@
#include "r_sky.h" #include "r_sky.h"
#include "po_man.h" #include "po_man.h"
#include "r_data/colormaps.h" #include "r_data/colormaps.h"
#include "g_levellocals.h"
EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor); EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor);

View file

@ -67,6 +67,7 @@
#include "swrenderer/things/r_wallsprite.h" #include "swrenderer/things/r_wallsprite.h"
#include "swrenderer/things/r_sprite.h" #include "swrenderer/things/r_sprite.h"
#include "swrenderer/r_memory.h" #include "swrenderer/r_memory.h"
#include "g_levellocals.h"
EXTERN_CVAR(Int, r_drawfuzz) EXTERN_CVAR(Int, r_drawfuzz)
EXTERN_CVAR(Bool, r_drawvoxels) EXTERN_CVAR(Bool, r_drawvoxels)

View file

@ -54,6 +54,7 @@
#include "swrenderer/scene/r_portal.h" #include "swrenderer/scene/r_portal.h"
#include "swrenderer/things/r_sprite.h" #include "swrenderer/things/r_sprite.h"
#include "swrenderer/r_memory.h" #include "swrenderer/r_memory.h"
#include "g_levellocals.h"
EXTERN_CVAR(Bool, st_scale) EXTERN_CVAR(Bool, st_scale)
EXTERN_CVAR(Bool, r_drawplayersprites) EXTERN_CVAR(Bool, r_drawplayersprites)