- Fixed: Putting a lightlist in a sector caused that sector's floorlight and ceilinglight to be ignored.

SVN r4193 (trunk)
This commit is contained in:
Randy Heit 2013-03-21 02:28:07 +00:00
parent cb41771342
commit 34b2d0b21a

View file

@ -1072,8 +1072,13 @@ void R_Subsector (subsector_t *sub)
{ {
light = P_GetPlaneLight(frontsector, &frontsector->ceilingplane, false); light = P_GetPlaneLight(frontsector, &frontsector->ceilingplane, false);
basecolormap = light->extra_colormap; basecolormap = light->extra_colormap;
// If this is the real ceiling, don't discard plane lighting R_FakeFlat()
// accounted for.
if (light->p_lightlevel != &frontsector->lightlevel)
{
ceilinglightlevel = *light->p_lightlevel; ceilinglightlevel = *light->p_lightlevel;
} }
}
else else
{ {
basecolormap = frontsector->ColorMap; basecolormap = frontsector->ColorMap;
@ -1103,8 +1108,13 @@ void R_Subsector (subsector_t *sub)
{ {
light = P_GetPlaneLight(frontsector, &frontsector->floorplane, false); light = P_GetPlaneLight(frontsector, &frontsector->floorplane, false);
basecolormap = light->extra_colormap; basecolormap = light->extra_colormap;
// If this is the real floor, don't discard plane lighting R_FakeFlat()
// accounted for.
if (light->p_lightlevel != &frontsector->lightlevel)
{
floorlightlevel = *light->p_lightlevel; floorlightlevel = *light->p_lightlevel;
} }
}
else else
{ {
basecolormap = frontsector->ColorMap; basecolormap = frontsector->ColorMap;