zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The CollectSectorStack functions had a local sector_t variable used by gl_FakeFlat which caused a stack overflow. Using the global one defined at the top of the file is ok here.

Browse source
This commit is contained in:
Christoph Oelckers 2015-05-29 12:03:50 +02:00
parent a59824cd88
commit 065b7f9ad2
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gl/scene/gl_renderhacks.cpp
View file

@ -1045,8 +1045,6 @@ void FDrawInfo::AddCeilingStack(sector_t * sec)
void FDrawInfo::CollectSectorStacksCeiling(subsector_t * sub, sector_t * anchor)
{
sector_t fake;
// mark it checked
sub->validcount=validcount;
@ -1057,7 +1055,7 @@ void FDrawInfo::CollectSectorStacksCeiling(subsector_t * sub, sector_t * anchor)
if (sub->numlines>2 && !(ss_renderflags[DWORD(sub-subsectors)]&SSRF_PROCESSED)) return;
// Must be the exact same visplane
sector_t * me = gl_FakeFlat(sub->render_sector, &fake, false);
sector_t * me = gl_FakeFlat(sub->render_sector, &fakesec, false);
if (me->GetTexture(sector_t::ceiling) != anchor->GetTexture(sector_t::ceiling) ||
me->ceilingplane != anchor->ceilingplane ||
me->GetCeilingLight() != anchor->GetCeilingLight() ||
@ -1094,7 +1092,6 @@ void FDrawInfo::CollectSectorStacksCeiling(subsector_t * sub, sector_t * anchor)
void FDrawInfo::CollectSectorStacksFloor(subsector_t * sub, sector_t * anchor)
{
sector_t fake;
// mark it checked
sub->validcount=validcount;
@ -1105,7 +1102,7 @@ void FDrawInfo::CollectSectorStacksFloor(subsector_t * sub, sector_t * anchor)
if (sub->numlines>2 && !(ss_renderflags[DWORD(sub-subsectors)]&SSRF_PROCESSED)) return;
// Must be the exact same visplane
sector_t * me = gl_FakeFlat(sub->render_sector, &fake, false);
sector_t * me = gl_FakeFlat(sub->render_sector, &fakesec, false);
if (me->GetTexture(sector_t::floor) != anchor->GetTexture(sector_t::floor) ||
me->floorplane != anchor->floorplane ||
me->GetFloorLight() != anchor->GetFloorLight() ||

1
src/gl/scene/gl_wall.h
View file

@ -136,7 +136,6 @@ public:
float bottomglowcolor[4];
int dynlightindex;
int firstwall, numwalls; // splitting info.
union
{