Merge branch 'translucency-transparency-transactions' into 'master'

Translucency transparency transactions

See merge request STJr/SRB2Internal!195
This commit is contained in:
Monster Iestyn 2018-10-10 14:26:10 -04:00
commit a13f076792

View file

@ -261,7 +261,7 @@ void R_Draw2sMultiPatchTranslucentColumn_8(void)
val = source[frac>>FRACBITS]; val = source[frac>>FRACBITS];
if (val != TRANSPARENTPIXEL) if (val != TRANSPARENTPIXEL)
*dest = colormap[*(transmap + (val<<8) + (*dest))]; *dest = *(transmap + (colormap[val]<<8) + (*dest));
dest += vid.width; dest += vid.width;
@ -281,12 +281,12 @@ void R_Draw2sMultiPatchTranslucentColumn_8(void)
{ {
val = source[(frac>>FRACBITS) & heightmask]; val = source[(frac>>FRACBITS) & heightmask];
if (val != TRANSPARENTPIXEL) if (val != TRANSPARENTPIXEL)
*dest = colormap[*(transmap + (val<<8) + (*dest))]; *dest = *(transmap + (colormap[val]<<8) + (*dest));
dest += vid.width; dest += vid.width;
frac += fracstep; frac += fracstep;
val = source[(frac>>FRACBITS) & heightmask]; val = source[(frac>>FRACBITS) & heightmask];
if (val != TRANSPARENTPIXEL) if (val != TRANSPARENTPIXEL)
*dest = colormap[*(transmap + (val<<8) + (*dest))]; *dest = *(transmap + (colormap[val]<<8) + (*dest));
dest += vid.width; dest += vid.width;
frac += fracstep; frac += fracstep;
} }
@ -294,7 +294,7 @@ void R_Draw2sMultiPatchTranslucentColumn_8(void)
{ {
val = source[(frac>>FRACBITS) & heightmask]; val = source[(frac>>FRACBITS) & heightmask];
if (val != TRANSPARENTPIXEL) if (val != TRANSPARENTPIXEL)
*dest = colormap[*(transmap + (val<<8) + (*dest))]; *dest = *(transmap + (colormap[val]<<8) + (*dest));
} }
} }
} }