From d0e551060dd0f5a78dcce5a013dc29110874047b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers <coelckers@zdoom.fake> Date: Sun, 29 Jun 2014 12:50:42 +0200 Subject: [PATCH] - fixed: When the 3D floor init code was updated 5 years ago for Vavoom's latest changes to its 3D-floor implementation it accidentally set the 3D-floor's alpha as its desaturation. --- src/p_3dfloors.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/p_3dfloors.cpp b/src/p_3dfloors.cpp index 95ced549a..91153715a 100644 --- a/src/p_3dfloors.cpp +++ b/src/p_3dfloors.cpp @@ -253,10 +253,11 @@ static int P_Set3DFloor(line_t * line, int param, int param2, int alpha) l->frontsector->ColorMap = GetSpecialLights (l->frontsector->ColorMap->Color, (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; } }