From 303d0048ea395d780c9a91727fcd315bdf25e3a6 Mon Sep 17 00:00:00 2001 From: terminx Date: Sat, 6 Apr 2019 06:38:17 +0000 Subject: [PATCH] We probably don't want to be bailing out here when handling a clipshape git-svn-id: https://svn.eduke32.com/eduke32@7486 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/src/clip.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/build/src/clip.cpp b/source/build/src/clip.cpp index cae97c3b9..121b2bfbf 100644 --- a/source/build/src/clip.cpp +++ b/source/build/src/clip.cpp @@ -1091,7 +1091,7 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum, int32_t xvect, int32_t yvect, } // We're not interested in any sector reached by portal traversal that we're "inside" of. - if (clipsectcnt != 1 && inside(pos->x, pos->y, dasect) == 1) break; + if (!curspr && clipsectcnt != 1 && inside(pos->x, pos->y, dasect) == 1) break; else if (clipyou) { int16_t objtype = int16_t(!curspr ? @@ -1112,7 +1112,7 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum, int32_t xvect, int32_t yvect, } else if (wal->nextsector>=0) { - if (inside(pos->x, pos->y, wal->nextsector) == 1) continue; + if (!curspr && inside(pos->x, pos->y, wal->nextsector) == 1) continue; int i; for (i=clipsectnum-1; i>=0; i--)