diff --git a/src/r_draw.c b/src/r_draw.c index b14459f08..b91ffa918 100644 --- a/src/r_draw.c +++ b/src/r_draw.c @@ -383,7 +383,7 @@ UINT8 *R_GetBlendTable(int style, INT32 alphalevel) size_t offs; if (style <= AST_COPY || style >= AST_OVERLAY) - return NULL; + return transtables + (ClipTransLevel(alphalevel) << FF_TRANSSHIFT); offs = (ClipBlendLevel(style, alphalevel) << FF_TRANSSHIFT); diff --git a/src/r_segs.c b/src/r_segs.c index 66ba42441..c27492680 100644 --- a/src/r_segs.c +++ b/src/r_segs.c @@ -289,24 +289,7 @@ static void R_Render2sidedMultiPatchColumn(column_t *column) transnum_t R_GetLinedefTransTable(fixed_t alpha) { - if (alpha < 9830) - return tr_trans90; - else if (alpha < 16384) - return tr_trans80; - else if (alpha < 22937) - return tr_trans70; - else if (alpha < 29491) - return tr_trans60; - else if (alpha < 36044) - return tr_trans50; - else if (alpha < 42598) - return tr_trans40; - else if (alpha < 49152) - return tr_trans30; - else if (alpha < 55705) - return tr_trans20; - else - return tr_trans10; + return (20*(FRACUNIT - alpha - 1) + FRACUNIT) >> (FRACBITS+1); } void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2) @@ -350,7 +333,7 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2) } else if (ldef->alpha > 0 && ldef->alpha < FRACUNIT) { - dc_transmap = transtables + ((R_GetLinedefTransTable(ldef->alpha) - 1) << FF_TRANSSHIFT); + dc_transmap = R_GetTranslucencyTable(R_GetLinedefTransTable(ldef->alpha)); colfunc = fuzzcolfunc; } else if (ldef->special == 909)