Skip to content
Snippets Groups Projects
Commit 2d1f927a authored by Monster Iestyn's avatar Monster Iestyn
Browse files

Fix the nonsense going on here regarding dc_colormap, this makes FOF walls...

Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.

...that was a mouthful
parent 80cbad61
Branches
Tags
2 merge requests!488Merge in next and don't billboard papersprites in GL,!317FOF wall rendering fixes and cleanup
...@@ -1182,10 +1182,11 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor) ...@@ -1182,10 +1182,11 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
pindex = MAXLIGHTSCALE - 1; pindex = MAXLIGHTSCALE - 1;
dc_colormap = walllights[pindex]; dc_colormap = walllights[pindex];
if (frontsector->extra_colormap)
dc_colormap = frontsector->extra_colormap->colormap + (dc_colormap - colormaps);
if (pfloor->flags & FF_FOG && pfloor->master->frontsector->extra_colormap) if (pfloor->flags & FF_FOG && pfloor->master->frontsector->extra_colormap)
dc_colormap = pfloor->master->frontsector->extra_colormap->colormap + (dc_colormap - colormaps); dc_colormap = pfloor->master->frontsector->extra_colormap->colormap + (dc_colormap - colormaps);
else if (frontsector->extra_colormap)
dc_colormap = frontsector->extra_colormap->colormap + (dc_colormap - colormaps);
// draw the texture // draw the texture
colfunc_2s (col); colfunc_2s (col);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment