From ea92b9548378fb99848a75cdddf24de5a0af3886 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 25 Dec 2016 06:00:18 +0100 Subject: [PATCH] Change define to if statement --- src/r_walldraw.cpp | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/r_walldraw.cpp b/src/r_walldraw.cpp index 4f532a78e8..8941443001 100644 --- a/src/r_walldraw.cpp +++ b/src/r_walldraw.cpp @@ -805,29 +805,31 @@ static void ProcessWallWorker( double xmagnitude = 1.0; -#if !defined(NO_DYNAMIC_SWLIGHTS) - for (int x = x1; x < x2; x++, light += rw_lightstep) + if (r_dynlights) { - int y1 = uwal[x]; - int y2 = dwal[x]; - if (y2 <= y1) - continue; + for (int x = x1; x < x2; x++, light += rw_lightstep) + { + int y1 = uwal[x]; + int y2 = dwal[x]; + if (y2 <= y1) + continue; - if (!fixed) - R_SetColorMapLight(basecolormap, light, wallshade); + if (!fixed) + R_SetColorMapLight(basecolormap, light, wallshade); - if (x + 1 < x2) xmagnitude = fabs(FIXED2DBL(lwal[x + 1]) - FIXED2DBL(lwal[x])); + if (x + 1 < x2) xmagnitude = fabs(FIXED2DBL(lwal[x + 1]) - FIXED2DBL(lwal[x])); - WallSampler sampler(y1, swal[x], yrepeat, lwal[x] + xoffset, xmagnitude, rw_pic, getcol); - Draw1Column(x, y1, y2, sampler, draw1column); + WallSampler sampler(y1, swal[x], yrepeat, lwal[x] + xoffset, xmagnitude, rw_pic, getcol); + Draw1Column(x, y1, y2, sampler, draw1column); + } + NetUpdate(); + return; } -#else + // Calculate where 4 column alignment begins and ends: int aligned_x1 = clamp((x1 + 3) / 4 * 4, x1, x2); int aligned_x2 = clamp(x2 / 4 * 4, x1, x2); - double xmagnitude = 1.0; - // First unaligned columns: for (int x = x1; x < aligned_x1; x++, light += rw_lightstep) { @@ -956,7 +958,6 @@ static void ProcessWallWorker( WallSampler sampler(y1, swal[x], yrepeat, lwal[x] + xoffset, xmagnitude, rw_pic, getcol); Draw1Column(x, y1, y2, sampler, draw1column); } -#endif NetUpdate(); }