From 41a107a89f1fe8d99d82f7d33aeda5cd9d3bb9b0 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 2 Jan 2017 17:57:26 +0200 Subject: [PATCH] Fixed compilation with GCC/Clang No more 'error: cannot jump from this goto statement to its label' because of 'note: jump bypasses variable initialization' --- src/swrenderer/scene/r_segs.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/swrenderer/scene/r_segs.cpp b/src/swrenderer/scene/r_segs.cpp index ca921efa6..4d85a736d 100644 --- a/src/swrenderer/scene/r_segs.cpp +++ b/src/swrenderer/scene/r_segs.cpp @@ -203,6 +203,8 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2) mfloorclip = openings + ds->sprbottomclip - ds->x1; mceilingclip = openings + ds->sprtopclip - ds->x1; + float *MaskedSWall, MaskedScaleY, rw_scalestep; + // [RH] Draw fog partition if (ds->bFogBoundary) { @@ -217,11 +219,11 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2) goto clearfog; } - float *MaskedSWall = (float *)(openings + ds->swall) - ds->x1; - float MaskedScaleY = ds->yscale; + MaskedSWall = (float *)(openings + ds->swall) - ds->x1; + MaskedScaleY = ds->yscale; maskedtexturecol = (fixed_t *)(openings + ds->maskedtexturecol) - ds->x1; spryscale = ds->iscale + ds->iscalestep * (x1 - ds->x1); - float rw_scalestep = ds->iscalestep; + rw_scalestep = ds->iscalestep; if (fixedlightlev >= 0) R_SetColorMapLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : basecolormap, 0, FIXEDLIGHT2SHADE(fixedlightlev));