From 388da85937a9f8263b7dd9a4b4fb896dc5e95c2b Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Mon, 2 Jan 2017 03:46:48 +0100 Subject: [PATCH] Move some more vars --- src/swrenderer/line/r_line.cpp | 4 ++++ src/swrenderer/line/r_line.h | 4 ++++ src/swrenderer/scene/r_bsp.cpp | 3 --- src/swrenderer/scene/r_bsp.h | 3 --- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/swrenderer/line/r_line.cpp b/src/swrenderer/line/r_line.cpp index 60107f2a1..b2a1a3fa2 100644 --- a/src/swrenderer/line/r_line.cpp +++ b/src/swrenderer/line/r_line.cpp @@ -25,6 +25,10 @@ namespace swrenderer { + seg_t *curline; + side_t *sidedef; + line_t *linedef; + FWallCoords WallC; FWallTmapVals WallT; diff --git a/src/swrenderer/line/r_line.h b/src/swrenderer/line/r_line.h index 345b5e994..d4be54493 100644 --- a/src/swrenderer/line/r_line.h +++ b/src/swrenderer/line/r_line.h @@ -23,6 +23,10 @@ namespace swrenderer void InitFromLine(const DVector2 &left, const DVector2 &right); }; + extern seg_t *curline; + extern side_t *sidedef; + extern line_t *linedef; + extern FWallCoords WallC; extern FWallTmapVals WallT; diff --git a/src/swrenderer/scene/r_bsp.cpp b/src/swrenderer/scene/r_bsp.cpp index 111f09c1c..6c0c1be1c 100644 --- a/src/swrenderer/scene/r_bsp.cpp +++ b/src/swrenderer/scene/r_bsp.cpp @@ -62,9 +62,6 @@ namespace swrenderer { using namespace drawerargs; -seg_t* curline; -side_t* sidedef; -line_t* linedef; sector_t* frontsector; sector_t* backsector; diff --git a/src/swrenderer/scene/r_bsp.h b/src/swrenderer/scene/r_bsp.h index 3ab94b288..7530718b8 100644 --- a/src/swrenderer/scene/r_bsp.h +++ b/src/swrenderer/scene/r_bsp.h @@ -46,9 +46,6 @@ enum extern subsector_t *InSubsector; -extern seg_t* curline; -extern side_t* sidedef; -extern line_t* linedef; extern sector_t* frontsector; extern sector_t* backsector;