From a8398e70b01dcca803d663d8db807f9c81eeed37 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 31 Dec 2014 23:01:06 +0100 Subject: [PATCH] - fixed: The brightfog flag in the GL related map settings was never initialized. - fixed: brightfog should not disable colored lighting for the weapon sprite. --- src/gl/data/gl_data.cpp | 1 + src/gl/scene/gl_weapon.cpp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gl/data/gl_data.cpp b/src/gl/data/gl_data.cpp index 6aa05c64a..735ef0439 100644 --- a/src/gl/data/gl_data.cpp +++ b/src/gl/data/gl_data.cpp @@ -207,6 +207,7 @@ struct FGLROptions : public FOptionalMapinfoData fogdensity = 0; outsidefogdensity = 0; skyfog = 0; + brightfog = false; lightmode = -1; nocoloredspritelighting = -1; notexturefill = -1; diff --git a/src/gl/scene/gl_weapon.cpp b/src/gl/scene/gl_weapon.cpp index 67950ce0e..42397166b 100644 --- a/src/gl/scene/gl_weapon.cpp +++ b/src/gl/scene/gl_weapon.cpp @@ -279,11 +279,10 @@ void FGLRenderer::DrawPlayerSprites(sector_t * viewsector, bool hudModelStep) } - // Korshun: fullbright fog in opengl, render weapon sprites fullbright. + // Korshun: fullbright fog in opengl, render weapon sprites fullbright (but don't cancel out the light color!) if (glset.brightfog && ((level.flags&LEVEL_HASFADETABLE) || cm.FadeColor != 0)) { lightlevel = 255; - statebright[0] = statebright[1] = true; } PalEntry ThingColor = (playermo->RenderStyle.Flags & STYLEF_ColorIsFixed) ? playermo->fillcolor : 0xffffff;