From 6a826f37bd6b244d2a4c483e75ccbf43e071080d Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 26 Jan 2017 22:21:22 +0200 Subject: [PATCH] Fixed compilation with GCC/Clang No more 'error: cannot jump from this goto statement to its label' --- src/swrenderer/things/r_decal.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/swrenderer/things/r_decal.cpp b/src/swrenderer/things/r_decal.cpp index eb34f7c3a..c6843a7fc 100644 --- a/src/swrenderer/things/r_decal.cpp +++ b/src/swrenderer/things/r_decal.cpp @@ -147,6 +147,7 @@ namespace swrenderer decal_left = decal_pos - edge_left * angvec - ViewPos; decal_right = decal_pos + edge_right * angvec - ViewPos; + CameraLight *cameraLight; double texturemid; if (WallC.Init(decal_left, decal_right, TOO_CLOSE_Z)) @@ -253,7 +254,7 @@ namespace swrenderer } light = lightleft + (x1 - savecoord.sx1) * lightstep; - CameraLight *cameraLight = CameraLight::Instance(); + cameraLight = CameraLight::Instance(); if (cameraLight->fixedlightlev >= 0) R_SetColorMapLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev)); else if (cameraLight->fixedcolormap != NULL)