zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a distance check to clipupdatesector() to prevent traversing through portals that are outside the wall distance passed to clipmove()

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7582 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-04-18 17:23:50 +00:00 committed by Christoph Oelckers
parent 76d7fec2ff
commit b46bc73322
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -920,9 +920,16 @@ int sectoradjacent(int sect1, int sect2)
return 0; return 0;
} }
static void clipupdatesector(int32_t const x, int32_t const y, int16_t * const sectnum) static inline int32_t clipwalldist(vec2_t const &p, int const w)
{ {
if (inside_p(x, y, *sectnum)) int32_t closestx, closesty;
yax_getclosestpointonwall(w, &closestx, &closesty);
return klabs(closestx - p.x) + klabs(closesty - p.y);
}
static void clipupdatesector(vec2_t const &p, int16_t * const sectnum, int const walldist)
{
if (inside_p(p.x, p.y, *sectnum))
return; return;
static int16_t sectlist[MAXSECTORS]; static int16_t sectlist[MAXSECTORS];
@ -933,7 +940,7 @@ static void clipupdatesector(int32_t const x, int32_t const y, int16_t * const s
for (int sectcnt = 0; sectcnt < nsecs; sectcnt++) for (int sectcnt = 0; sectcnt < nsecs; sectcnt++)
{ {
if (inside_p(x, y, sectlist[sectcnt])) if (inside_p(p.x, p.y, sectlist[sectcnt]))
SET_AND_RETURN(*sectnum, sectlist[sectcnt]); SET_AND_RETURN(*sectnum, sectlist[sectcnt]);
auto const sec = &sector[sectlist[sectcnt]]; auto const sec = &sector[sectlist[sectcnt]];
@ -949,9 +956,9 @@ static void clipupdatesector(int32_t const x, int32_t const y, int16_t * const s
for (int sectcnt = 0; sectcnt < nsecs; sectcnt++) for (int sectcnt = 0; sectcnt < nsecs; sectcnt++)
{ {
if (inside_p(x, y, sectlist[sectcnt])) if (inside_p(p.x, p.y, sectlist[sectcnt]))
{ {
// add sector to clipping list so the next call to clipdatesector() // add sector to clipping list so the next call to clipupdatesector()
// finishes in the loop above this one // finishes in the loop above this one
addclipsect(sectlist[sectcnt]); addclipsect(sectlist[sectcnt]);
SET_AND_RETURN(*sectnum, sectlist[sectcnt]); SET_AND_RETURN(*sectnum, sectlist[sectcnt]);
@ -963,7 +970,7 @@ static void clipupdatesector(int32_t const x, int32_t const y, int16_t * const s
// check floor curbs here? // check floor curbs here?
for (int j = startwall; j < endwall; j++) for (int j = startwall; j < endwall; j++)
if (wall[j].nextsector >= 0) if (wall[j].nextsector >= 0 && clipwalldist(p, j) <= walldist)
bfirst_search_try(sectlist, sectbitmap, &nsecs, wall[j].nextsector); bfirst_search_try(sectlist, sectbitmap, &nsecs, wall[j].nextsector);
} }
@ -1339,7 +1346,7 @@ int32_t clipmove(vec3_t * const pos, int16_t * const sectnum, int32_t xvect, int
if ((tempint1^tempint2) < 0) if ((tempint1^tempint2) < 0)
{ {
clipupdatesector(pos->x, pos->y, sectnum); clipupdatesector(*(vec2_t *)pos, sectnum, rad);
return clipReturn; return clipReturn;
} }
} }
@ -1354,7 +1361,7 @@ int32_t clipmove(vec3_t * const pos, int16_t * const sectnum, int32_t xvect, int
} }
int const osectnum = *sectnum; int const osectnum = *sectnum;
clipupdatesector(vec.x, vec.y, sectnum); clipupdatesector(vec, sectnum, rad);
if (*sectnum == osectnum || editstatus || (*sectnum != -1 && !check_floor_curb(osectnum, *sectnum, flordist, pos->z, vec.x, vec.y))) if (*sectnum == osectnum || editstatus || (*sectnum != -1 && !check_floor_curb(osectnum, *sectnum, flordist, pos->z, vec.x, vec.y)))
{ {
@ -1493,7 +1500,7 @@ int32_t pushmove(vec3_t * const vect, int16_t * const sectnum,
} while (clipinsidebox((vec2_t *)vect, i, walldist-4) != 0); } while (clipinsidebox((vec2_t *)vect, i, walldist-4) != 0);
bad = -1; bad = -1;
k--; if (k <= 0) return bad; k--; if (k <= 0) return bad;
clipupdatesector(vect->x, vect->y, sectnum); clipupdatesector(*(vec2_t *)vect, sectnum, walldist);
if (*sectnum < 0) return -1; if (*sectnum < 0) return -1;
} }
else if (bitmap_test(clipsectormap, wal->nextsector) == 0) else if (bitmap_test(clipsectormap, wal->nextsector) == 0)