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

This commit is contained in:
Chris Robinson 2014-07-01 22:14:49 -07:00
commit 1aaaac900d

View file

@ -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;
}
}