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

- fixed: When applying Boom's Transfer_Heights effect to a sector, gl_FakeFlat needs to remove all portals from the original sector planes that are being replaced in the sector copy.

Browse source
This commit is contained in:
Christoph Oelckers 2014-09-11 13:02:39 +02:00
parent 62880f113b
commit 25951362fc
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gl/scene/gl_fakeflat.cpp
View file

@ -311,6 +311,9 @@ sector_t * gl_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool bac
dest->vboindex[sector_t::ceiling] = sec->vboindex[sector_t::vbo_fakefloor]; dest->vboindex[sector_t::ceiling] = sec->vboindex[sector_t::vbo_fakefloor];
dest->vboheight[sector_t::ceiling] = s->vboheight[sector_t::floor]; dest->vboheight[sector_t::ceiling] = s->vboheight[sector_t::floor];
dest->portals[sector_t::ceiling] = NULL;
if (!(s->MoreFlags & SECF_NOFAKELIGHT)) if (!(s->MoreFlags & SECF_NOFAKELIGHT))
{ {
dest->lightlevel = s->lightlevel; dest->lightlevel = s->lightlevel;
@ -347,12 +350,12 @@ sector_t * gl_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool bac
} }
} }
} }
else if (in_area==area_above) else if (in_area == area_above)
{ {
dest->ColorMap=s->ColorMap; dest->ColorMap = s->ColorMap;
dest->SetPlaneTexZ(sector_t::ceiling, sec->GetPlaneTexZ(sector_t::ceiling)); dest->SetPlaneTexZ(sector_t::ceiling, sec->GetPlaneTexZ(sector_t::ceiling));
dest->SetPlaneTexZ(sector_t::floor, s->GetPlaneTexZ(sector_t::ceiling)); dest->SetPlaneTexZ(sector_t::floor, s->GetPlaneTexZ(sector_t::ceiling));
dest->ceilingplane= sec->ceilingplane; dest->ceilingplane = sec->ceilingplane;
dest->floorplane = s->ceilingplane; dest->floorplane = s->ceilingplane;
dest->floorplane.FlipVert(); dest->floorplane.FlipVert();
@ -362,6 +365,8 @@ sector_t * gl_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool bac
dest->vboindex[sector_t::ceiling] = sec->vboindex[sector_t::ceiling]; dest->vboindex[sector_t::ceiling] = sec->vboindex[sector_t::ceiling];
dest->vboheight[sector_t::ceiling] = sec->vboheight[sector_t::ceiling]; dest->vboheight[sector_t::ceiling] = sec->vboheight[sector_t::ceiling];
dest->portals[sector_t::floor] = NULL;
if (!(s->MoreFlags & SECF_NOFAKELIGHT)) if (!(s->MoreFlags & SECF_NOFAKELIGHT))
{ {
dest->lightlevel = s->lightlevel; dest->lightlevel = s->lightlevel;