zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Further clipmove() improvements to better deal with sector-over-sector

Browse source 
There's still something wrong here, but this at least fixes Duke3D E1L2.

git-svn-id: https://svn.eduke32.com/eduke32@7450 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-03-24 00:43:25 +00:00 committed by Christoph Oelckers
parent ba1dd663dd
commit 66734e34bf
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1091,6 +1091,10 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum,
if (wal->nextsector>=0) if (wal->nextsector>=0)
{ {
// This fixes Duke3D E1L2.
// We're not interested in any sector reached by portal traversal that we're "inside" of.
if (inside(pos->x, pos->y, wal->nextsector)) break;
for (i=clipsectnum-1; i>=0; i--) for (i=clipsectnum-1; i>=0; i--)
if (wal->nextsector == clipsectorlist[i]) break; if (wal->nextsector == clipsectorlist[i]) break;
if (i < 0) clipsectorlist[clipsectnum++] = wal->nextsector; if (i < 0) clipsectorlist[clipsectnum++] = wal->nextsector;
@ -1262,7 +1266,7 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum,
clipit[j].y2-clipit[j].y1, oyvect); clipit[j].y2-clipit[j].y1, oyvect);
if ((tempint1^tempint2) < 0) if ((tempint1^tempint2) < 0)
{ {
updatesector(pos->x, pos->y, sectnum); updatesectorz(pos->x, pos->y, pos->z, sectnum);
return retval; return retval;
} }
} }
@ -1279,8 +1283,10 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum,
pos->x = intx; pos->x = intx;
pos->y = inty; pos->y = inty;
updatesectorz(pos->x, pos->y, pos->z, sectnum);
} while ((xvect|yvect) != 0 && hitwall >= 0 && cnt > 0); } while ((xvect|yvect) != 0 && hitwall >= 0 && cnt > 0);
// I'm not a fan of these brute-force searches but this one should be OK
for (j=0; j<clipsectnum; j++) for (j=0; j<clipsectnum; j++)
if (inside(pos->x, pos->y, clipsectorlist[j]) == 1) if (inside(pos->x, pos->y, clipsectorlist[j]) == 1)
{ {
@ -1288,25 +1294,7 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum,
return retval; return retval;
} }
updatesector(pos->x, pos->y, sectnum); updatesectorz(pos->x, pos->y, pos->z, sectnum);
j = *sectnum;
tempint1 = 0;
int const floorz = (sector[j].floorstat & 2) ? getflorzofslope(j, pos->x, pos->y) : sector[j].floorz;
if (pos->z + flordist - floorz <= 0)
tempint1++;
else
{
int const ceilz = (sector[j].ceilingstat & 2) ? getceilzofslope(j, pos->x, pos->y) : sector[j].ceilingz;
if (pos->z - ceildist - ceilz > 0)
tempint1++;
}
if (tempint1)
*sectnum = j;
return retval; return retval;
} }