zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

We probably don't want to be bailing out here when handling a clipshape

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7486 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-04-06 06:38:17 +00:00 committed by Christoph Oelckers
parent 5ac5a2ad3c
commit 303d0048ea
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/build/src/clip.cpp
View file

@ -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. // 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) else if (clipyou)
{ {
int16_t objtype = int16_t(!curspr ? 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) 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; int i;
for (i=clipsectnum-1; i>=0; i--) for (i=clipsectnum-1; i>=0; i--)