Merge branch 'master' into AutoDoom

ioan-chera · Mar 14, 2017 · ebc54d2 · ebc54d2
2 parents cff90f5 + 34aaeec
commit ebc54d2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/source/cam_common.cpp b/source/cam_common.cpp
@@ -553,6 +553,11 @@ void lineopening_t::calculate(const line_t *linedef)
    const sector_t *front = linedef->frontsector;
    const sector_t *back = linedef->backsector;
 
+   const sector_t *beyond = linedef->intflags & MLI_POLYPORTALLINE &&
+      linedef->beyondportalline ? linedef->beyondportalline->frontsector : nullptr;
+   if(beyond)
+      back = beyond;
+
    // no need to apply the portal hack (1024 units) here fortunately
    if(linedef->extflags & EX_ML_UPPERPORTAL)
       opentop = front->ceilingheight;

diff --git a/source/p_maputl.cpp b/source/p_maputl.cpp
@@ -262,6 +262,11 @@ void P_LineOpening(const line_t *linedef, const Mobj *mo, bool portaldetect,
    }
    clip.openfrontsector = linedef->frontsector;
    clip.openbacksector  = linedef->backsector;
+   sector_t *beyond = linedef->intflags & MLI_POLYPORTALLINE &&
+      linedef->beyondportalline ?
+      linedef->beyondportalline->frontsector : nullptr;
+   if(beyond)
+      clip.openbacksector = beyond;
 
    // SoM: ok, new plan. The only way a 2s line should give a lowered floor or hightened ceiling
    // z is if both sides of that line have the same portal.