zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-18 02:12:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The flat drawing code assumed that the first element of the light list originated from the sector itself. This had been true formerly but in some situations it no longer is.

Browse source
This commit is contained in:
Christoph Oelckers 2015-02-10 21:52:19 +01:00
parent 00639121c0
commit a5a53c51e6
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/scene/gl_flats.cpp
View file

@ -546,7 +546,7 @@ void GLFlat::ProcessSector(sector_t * frontsector)
if (x.ffloors.Size()) if (x.ffloors.Size())
{ {
light = P_GetPlaneLight(sector, &frontsector->floorplane, false); light = P_GetPlaneLight(sector, &frontsector->floorplane, false);
if ((!(sector->GetFlags(sector_t::floor)&PLANEF_ABSLIGHTING) || light!=&x.lightlist[0]) if ((!(sector->GetFlags(sector_t::floor)&PLANEF_ABSLIGHTING) || !light->fromsector)
&& (light->p_lightlevel != &frontsector->lightlevel)) && (light->p_lightlevel != &frontsector->lightlevel))
{ {
lightlevel = *light->p_lightlevel; lightlevel = *light->p_lightlevel;

4
src/p_3dfloors.cpp
View file

@ -584,6 +584,7 @@ void P_Recalculate3DFloors(sector_t * sector)
lightlist[0].extra_colormap = sector->ColorMap; lightlist[0].extra_colormap = sector->ColorMap;
lightlist[0].blend = 0; lightlist[0].blend = 0;
lightlist[0].flags = 0; lightlist[0].flags = 0;
lightlist[0].fromsector = true;
maxheight = sector->CenterCeiling(); maxheight = sector->CenterCeiling();
minheight = sector->CenterFloor(); minheight = sector->CenterFloor();
@ -605,6 +606,7 @@ void P_Recalculate3DFloors(sector_t * sector)
newlight.extra_colormap = rover->GetColormap(); newlight.extra_colormap = rover->GetColormap();
newlight.blend = rover->GetBlend(); newlight.blend = rover->GetBlend();
newlight.flags = rover->flags; newlight.flags = rover->flags;
newlight.fromsector = false;
lightlist.Push(newlight); lightlist.Push(newlight);
} }
else if (i==0) else if (i==0)
@ -619,6 +621,7 @@ void P_Recalculate3DFloors(sector_t * sector)
lightlist[0].extra_colormap = rover->GetColormap(); lightlist[0].extra_colormap = rover->GetColormap();
lightlist[0].blend = rover->GetBlend(); lightlist[0].blend = rover->GetBlend();
lightlist[0].flags = rover->flags; lightlist[0].flags = rover->flags;
lightlist[0].fromsector = false;
} }
} }
if (rover->flags&FF_DOUBLESHADOW) if (rover->flags&FF_DOUBLESHADOW)
@ -643,6 +646,7 @@ void P_Recalculate3DFloors(sector_t * sector)
newlight.blend = 0; newlight.blend = 0;
} }
newlight.flags = rover->flags; newlight.flags = rover->flags;
newlight.fromsector = false;
lightlist.Push(newlight); lightlist.Push(newlight);
} }
} }

1
src/p_3dfloors.h
View file

@ -123,6 +123,7 @@ struct lightlist_t
int flags; int flags;
F3DFloor* lightsource; F3DFloor* lightsource;
F3DFloor* caster; F3DFloor* caster;
bool fromsector;
}; };