From 918904074ae4ff90711b7c603f34bca201041caa Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sat, 31 Dec 2016 12:57:48 +0100 Subject: [PATCH] Remove wallshade global from R_DrawFogBoundary --- src/swrenderer/plane/r_fogboundary.cpp | 2 +- src/swrenderer/plane/r_fogboundary.h | 2 +- src/swrenderer/scene/r_segs.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/swrenderer/plane/r_fogboundary.cpp b/src/swrenderer/plane/r_fogboundary.cpp index 5244b937f..3dff9fa60 100644 --- a/src/swrenderer/plane/r_fogboundary.cpp +++ b/src/swrenderer/plane/r_fogboundary.cpp @@ -42,7 +42,7 @@ namespace swrenderer short spanend[MAXHEIGHT]; } - void R_DrawFogBoundary(int x1, int x2, short *uclip, short *dclip) + void R_DrawFogBoundary(int x1, int x2, short *uclip, short *dclip, int wallshade) { // This is essentially the same as R_MapVisPlane but with an extra step // to create new horizontal spans whenever the light changes enough that diff --git a/src/swrenderer/plane/r_fogboundary.h b/src/swrenderer/plane/r_fogboundary.h index 0e9af3322..f334e916b 100644 --- a/src/swrenderer/plane/r_fogboundary.h +++ b/src/swrenderer/plane/r_fogboundary.h @@ -5,6 +5,6 @@ namespace swrenderer { - void R_DrawFogBoundary(int x1, int x2, short *uclip, short *dclip); + void R_DrawFogBoundary(int x1, int x2, short *uclip, short *dclip, int wallshade); void R_DrawFogBoundarySection(int y, int y2, int x1); } diff --git a/src/swrenderer/scene/r_segs.cpp b/src/swrenderer/scene/r_segs.cpp index 5a8fb2982..0ebfaa084 100644 --- a/src/swrenderer/scene/r_segs.cpp +++ b/src/swrenderer/scene/r_segs.cpp @@ -272,7 +272,7 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2) // [RH] Draw fog partition if (ds->bFogBoundary) { - R_DrawFogBoundary (x1, x2, mceilingclip, mfloorclip); + R_DrawFogBoundary (x1, x2, mceilingclip, mfloorclip, wallshade); if (ds->maskedtexturecol == -1) { goto clearfog;