Use RGB/RGBA macros in 447 code
This commit is contained in:
parent
3e49cc68d2
commit
b9e4cd40ca
|
@ -3272,7 +3272,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
||||||
: 0;
|
: 0;
|
||||||
if (line->flags & ML_EFFECT3) // relative calc
|
if (line->flags & ML_EFFECT3) // relative calc
|
||||||
alpha = max(min(R_GetRgbaA(sectors[secnum].extra_colormap->rgba) + alpha, 25), 0);
|
alpha = max(min(R_GetRgbaA(sectors[secnum].extra_colormap->rgba) + alpha, 25), 0);
|
||||||
dest_colormap->rgba = (dest_colormap->rgba & 0xFFFFFF) + (alpha << 24);
|
dest_colormap->rgba = R_GetRgbaRGB(dest_colormap->rgba) + R_PutRgbaA(alpha);
|
||||||
|
|
||||||
// fade rgba
|
// fade rgba
|
||||||
alpha = (line->flags & ML_DONTPEGBOTTOM && line->sidenum[1] != 0xFFFF) ?
|
alpha = (line->flags & ML_DONTPEGBOTTOM && line->sidenum[1] != 0xFFFF) ?
|
||||||
|
@ -3282,7 +3282,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
||||||
: 0;
|
: 0;
|
||||||
if (line->flags & ML_EFFECT3) // relative calc
|
if (line->flags & ML_EFFECT3) // relative calc
|
||||||
alpha = max(min(R_GetRgbaA(sectors[secnum].extra_colormap->fadergba) + alpha, 25), 0);
|
alpha = max(min(R_GetRgbaA(sectors[secnum].extra_colormap->fadergba) + alpha, 25), 0);
|
||||||
dest_colormap->fadergba = (dest_colormap->fadergba & 0xFFFFFF) + (alpha << 24);
|
dest_colormap->fadergba = R_GetRgbaRGB(dest_colormap->fadergba) + R_PutRgbaA(alpha);
|
||||||
|
|
||||||
if (!(sectors[secnum].extra_colormap = R_GetColormapFromList(dest_colormap)))
|
if (!(sectors[secnum].extra_colormap = R_GetColormapFromList(dest_colormap)))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue