zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 23:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2013-08-09 23:41:25 +02:00
commit 6e263f76b1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_3dfloors.cpp
View file

@ -61,7 +61,7 @@ EXTERN_CVAR(Int, vid_renderer)
FDynamicColormap *F3DFloor::GetColormap() FDynamicColormap *F3DFloor::GetColormap()
{ {
// If there's no fog in either model or target sector this is easy and fast. // If there's no fog in either model or target sector this is easy and fast.
if ((target->ColorMap->Fade == 0 && model->ColorMap->Fade == 0) || (flags & FF_FADEWALLS)) if ((target->ColorMap->Fade == 0 && model->ColorMap->Fade == 0) || (flags & (FF_FADEWALLS|FF_FOG)))
{ {
return model->ColorMap; return model->ColorMap;
} }