zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: The brightfog flag in the GL related map settings was never initialized. 

- fixed: brightfog should not disable colored lighting for the weapon sprite.
This commit is contained in:
Christoph Oelckers 2014-12-31 23:01:06 +01:00
parent 4f08b20df5
commit a8398e70b0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gl/data/gl_data.cpp
View File

@ -207,6 +207,7 @@ struct FGLROptions : public FOptionalMapinfoData
fogdensity = 0; fogdensity = 0;
outsidefogdensity = 0; outsidefogdensity = 0;
skyfog = 0; skyfog = 0;
brightfog = false;
lightmode = -1; lightmode = -1;
nocoloredspritelighting = -1; nocoloredspritelighting = -1;
notexturefill = -1; notexturefill = -1;

3
src/gl/scene/gl_weapon.cpp
View File

@ -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)) if (glset.brightfog && ((level.flags&LEVEL_HASFADETABLE) || cm.FadeColor != 0))
{ {
lightlevel = 255; lightlevel = 255;
statebright[0] = statebright[1] = true;
} }
PalEntry ThingColor = (playermo->RenderStyle.Flags & STYLEF_ColorIsFixed) ? playermo->fillcolor : 0xffffff; PalEntry ThingColor = (playermo->RenderStyle.Flags & STYLEF_ColorIsFixed) ? playermo->fillcolor : 0xffffff;