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

Merge remote-tracking branch 'zdoom/master' into openal

Browse source
This commit is contained in:
Chris Robinson 2014-07-01 22:14:49 -07:00
commit 1aaaac900d
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

@ -253,10 +253,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;
} }
} }