Fixed compilation with GCC/Clang

No more 'error: cannot jump from this goto statement to its label'
This commit is contained in:
alexey.lysiuk 2017-01-26 22:21:22 +02:00
parent ed05a2edd3
commit 6a826f37bd

View file

@ -147,6 +147,7 @@ namespace swrenderer
decal_left = decal_pos - edge_left * angvec - ViewPos; decal_left = decal_pos - edge_left * angvec - ViewPos;
decal_right = decal_pos + edge_right * angvec - ViewPos; decal_right = decal_pos + edge_right * angvec - ViewPos;
CameraLight *cameraLight;
double texturemid; double texturemid;
if (WallC.Init(decal_left, decal_right, TOO_CLOSE_Z)) if (WallC.Init(decal_left, decal_right, TOO_CLOSE_Z))
@ -253,7 +254,7 @@ namespace swrenderer
} }
light = lightleft + (x1 - savecoord.sx1) * lightstep; light = lightleft + (x1 - savecoord.sx1) * lightstep;
CameraLight *cameraLight = CameraLight::Instance(); cameraLight = CameraLight::Instance();
if (cameraLight->fixedlightlev >= 0) if (cameraLight->fixedlightlev >= 0)
R_SetColorMapLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev)); R_SetColorMapLight((r_fullbrightignoresectorcolor) ? &FullNormalLight : usecolormap, 0, FIXEDLIGHT2SHADE(cameraLight->fixedlightlev));
else if (cameraLight->fixedcolormap != NULL) else if (cameraLight->fixedcolormap != NULL)