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

Merge branch 'master' into Glew_Version_For_Real

This commit is contained in:
Christoph Oelckers 2014-06-29 14:11:03 +02:00
parent 9d1dbf4eab a33b49c2c2
commit 2cd1118aad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/p_3dfloors.cpp
View File

@ -254,10 +254,11 @@ static int P_Set3DFloor(line_t * line, int param, int param2, int alpha)
l->frontsector->ColorMap = l->frontsector->ColorMap =
GetSpecialLights (l->frontsector->ColorMap->Color, GetSpecialLights (l->frontsector->ColorMap->Color,
(unsigned int)(vavoomcolors[l->args[0]]&VC_COLORMASK), (unsigned int)(vavoomcolors[l->args[0]]&VC_COLORMASK),
(unsigned int)(vavoomcolors[l->args[0]]&VC_ALPHAMASK)>>24); l->frontsector->ColorMap->Desaturate);
// l->frontsector->ColorMap->Desaturate);
alpha = (int)((unsigned int)(vavoomcolors[l->args[0]]&VC_ALPHAMASK)>>24);
} }
alpha=(alpha*255)/100; else alpha=(alpha*255)/100;
break; break;
} }
} }