diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index a98c1592f..63a1c862c 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -1274,8 +1274,6 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, endbot = endrealbot; #endif } - - Surf->PolyColor.s.alpha = alpha; #ifdef ESLOPE @@ -3645,39 +3643,13 @@ void HWR_Subsector(size_t num) else if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256) { light = R_GetPlaneLight(gr_frontsector, centerHeight, viewz < cullHeight ? true : false); - - if (gr_frontsector->lightlist[light].extra_colormap && rover->master->frontsector->extra_colormap && (rover->flags & FF_SWIMMABLE)) - { - UINT8 alpha; - - alpha = HWR_FogBlockAlpha(*gr_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap); - - HWR_AddTransparentFloor(0, - &extrasubsectors[num], - true, - *rover->topheight-20000, - *gr_frontsector->lightlist[light].lightlevel, - alpha, rover->master->frontsector, PF_Fog|PF_NoTexture, - true, rover->master->frontsector->extra_colormap); - - HWR_AddTransparentFloor(levelflats[*rover->toppic].lumpnum, - &extrasubsectors[num], - true, - *rover->topheight, - *gr_frontsector->lightlist[light].lightlevel, - max(0, min(rover->alpha, 255)), rover->master->frontsector, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Translucent, - false, gr_frontsector->lightlist[light].extra_colormap); - } - else - { - HWR_AddTransparentFloor(levelflats[*rover->toppic].lumpnum, - &extrasubsectors[num], - true, - *rover->topheight, - *gr_frontsector->lightlist[light].lightlevel, - max(0, min(rover->alpha, 255)), rover->master->frontsector, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Translucent, - false, gr_frontsector->lightlist[light].extra_colormap); - } + HWR_AddTransparentFloor(levelflats[*rover->toppic].lumpnum, + &extrasubsectors[num], + true, + *rover->topheight, + *gr_frontsector->lightlist[light].lightlevel, + max(0, min(rover->alpha, 255)), rover->master->frontsector, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Translucent, + false, gr_frontsector->lightlist[light].extra_colormap); } else {