zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed:In P_ChangeSector, floorOrCeil==2 means that only 3D midtextures moved. This means that 

* no 3D floor movement can take place
 * no portal changes can occur.
This commit is contained in:
Christoph Oelckers 2016-02-20 15:52:19 +01:00
parent 166687d971
commit b8f8daf1c1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/p_map.cpp
View File

@ -5495,7 +5495,7 @@ bool P_ChangeSector(sector_t *sector, int crunch, int amt, int floorOrCeil, bool
// Also process all sectors that have 3D floors transferred from the // Also process all sectors that have 3D floors transferred from the
// changed sector. // changed sector.
if (sector->e->XFloor.attached.Size()) if (sector->e->XFloor.attached.Size() && floorOrCeil != 2)
{ {
unsigned i; unsigned i;
sector_t* sec; sector_t* sec;
@ -5601,7 +5601,7 @@ bool P_ChangeSector(sector_t *sector, int crunch, int amt, int floorOrCeil, bool
} }
} while (n); // repeat from scratch until all things left are marked valid } while (n); // repeat from scratch until all things left are marked valid
sector->CheckPortalPlane(floorOrCeil); // check for portal obstructions after everything is done. if (floorOrCeil != 2) sector->CheckPortalPlane(floorOrCeil); // check for portal obstructions after everything is done.
if (!cpos.nofit && !isreset /* && sector->MoreFlags & (SECF_UNDERWATERMASK)*/) if (!cpos.nofit && !isreset /* && sector->MoreFlags & (SECF_UNDERWATERMASK)*/)
{ {