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

Uncomment extra check in COMBINE_STRIPS

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6573 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-12-20 08:35:49 +00:00
parent 2c48a359e2
commit 09c03151db
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/build/src/polymost.cpp
View file

@ -2445,8 +2445,8 @@ skip: ;
int const ni = vsp[i].n; int const ni = vsp[i].n;
if ((vsp[i].ctag == vsp[ni].ctag) && (vsp[i].ftag == vsp[ni].ftag) /*&& if ((vsp[i].ctag == vsp[ni].ctag) && (vsp[i].ftag == vsp[ni].ftag) &&
((vsp[i].cy[1] <= vsp[ni].cy[1]) || (vsp[i].fy[1] <= vsp[ni].fy[1]))*/) ((vsp[i].cy[1] <= vsp[ni].cy[1]) || (vsp[i].fy[1] <= vsp[ni].fy[1])))
{ {
vsp[i].cy[1] = vsp[ni].cy[1]; vsp[i].cy[1] = vsp[ni].cy[1];
vsp[i].fy[1] = vsp[ni].fy[1]; vsp[i].fy[1] = vsp[ni].fy[1];
@ -3836,11 +3836,12 @@ void polymost_scansector(int32_t sectnum)
gotsector[sectnum>>3] |= pow2char[sectnum&7]; gotsector[sectnum>>3] |= pow2char[sectnum&7];
int const bunchfrst = numbunches; int const bunchfrst = numbunches;
int const numscansbefore = numscans; int const onumscans = numscans;
int const startwall = sector[sectnum].wallptr; int const startwall = sector[sectnum].wallptr;
int const endwall = sector[sectnum].wallnum + startwall; int const endwall = sector[sectnum].wallnum + startwall;
int scanfirst = numscans; int scanfirst = numscans;
vec2f_t p2 = { 0, 0 }; vec2f_t p2 = { 0, 0 };
uwalltype *wal; uwalltype *wal;
@ -3849,6 +3850,7 @@ void polymost_scansector(int32_t sectnum)
for (z=startwall,wal=(uwalltype *)&wall[z]; z<endwall; z++,wal++) for (z=startwall,wal=(uwalltype *)&wall[z]; z<endwall; z++,wal++)
{ {
uwalltype const *const wal2 = (uwalltype *)&wall[wal->point2]; uwalltype const *const wal2 = (uwalltype *)&wall[wal->point2];
vec2f_t const fp1 = { (float)(wal->x - globalposx), (float)(wal->y - globalposy) }; vec2f_t const fp1 = { (float)(wal->x - globalposx), (float)(wal->y - globalposy) };
vec2f_t const fp2 = { (float)(wal2->x - globalposx), (float)(wal2->y - globalposy) }; vec2f_t const fp2 = { (float)(wal2->x - globalposx), (float)(wal2->y - globalposy) };
@ -3905,7 +3907,7 @@ void polymost_scansector(int32_t sectnum)
} }
} }
for (bssize_t z=numscansbefore; z<numscans; z++) for (bssize_t z=onumscans; z<numscans; z++)
{ {
if ((wall[thewall[z]].point2 != thewall[bunchp2[z]]) || (dxb2[z] > dxb1[bunchp2[z]])) if ((wall[thewall[z]].point2 != thewall[bunchp2[z]]) || (dxb2[z] > dxb1[bunchp2[z]]))
{ {