From b3cee51fd032f7888cd18b6f74f496808fe0e939 Mon Sep 17 00:00:00 2001
From: Magnus Norddahl <dpjudas@users.noreply.github.com>
Date: Tue, 3 Jan 2017 20:53:40 +0100
Subject: [PATCH] Fixed clang errors about the gotos leaving certain variables
uninitialized
---
src/swrenderer/segments/r_drawsegment.cpp | 6 ++++--
src/swrenderer/things/r_decal.cpp | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/swrenderer/segments/r_drawsegment.cpp b/src/swrenderer/segments/r_drawsegment.cpp
index ca20dd0dbf..7884415dee 100644
--- a/src/swrenderer/segments/r_drawsegment.cpp
+++ b/src/swrenderer/segments/r_drawsegment.cpp
@@ -125,6 +125,9 @@ namespace swrenderer
void R_RenderMaskedSegRange(drawseg_t *ds, int x1, int x2)
{
+ float *MaskedSWall = nullptr, MaskedScaleY = 0, rw_scalestep = 0;
+ fixed_t *maskedtexturecol = nullptr;
+
FTexture *tex;
int i;
sector_t tempsec; // killough 4/13/98
@@ -188,7 +191,6 @@ namespace swrenderer
mfloorclip = openings + ds->sprbottomclip - ds->x1;
mceilingclip = openings + ds->sprtopclip - ds->x1;
- float *MaskedSWall, MaskedScaleY, rw_scalestep;
// [RH] Draw fog partition
if (ds->bFogBoundary)
@@ -206,7 +208,7 @@ namespace swrenderer
MaskedSWall = (float *)(openings + ds->swall) - ds->x1;
MaskedScaleY = ds->yscale;
- fixed_t *maskedtexturecol = (fixed_t *)(openings + ds->maskedtexturecol) - ds->x1;
+ maskedtexturecol = (fixed_t *)(openings + ds->maskedtexturecol) - ds->x1;
spryscale = ds->iscale + ds->iscalestep * (x1 - ds->x1);
rw_scalestep = ds->iscalestep;
diff --git a/src/swrenderer/things/r_decal.cpp b/src/swrenderer/things/r_decal.cpp
index 19281d12b9..3acc73d62d 100644
--- a/src/swrenderer/things/r_decal.cpp
+++ b/src/swrenderer/things/r_decal.cpp
@@ -68,6 +68,7 @@ namespace swrenderer
bool calclighting;
bool rereadcolormap;
FDynamicColormap *usecolormap;
+ float light = 0;
if (decal->RenderFlags & RF_INVISIBLE || !viewactive || !decal->PicNum.isValid())
return;
@@ -243,7 +244,7 @@ namespace swrenderer
rereadcolormap = false;
}
- float light = lightleft + (x1 - savecoord.sx1) * lightstep;
+ light = lightleft + (x1 - savecoord.sx1) * lightstep;
if (fixedlightlev >= 0)
R_SetColorMapLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, FIXEDLIGHT2SHADE(fixedlightlev));
else if (fixedcolormap != NULL)