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

Mapster32: in build.c, prevent oob of wall[] if joining non-adjacent sectors.

Browse source 
Also, some minor stylistic cleanup.

git-svn-id: https://svn.eduke32.com/eduke32@4973 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2015-02-08 18:48:30 +00:00
parent 70dc2f7376
commit d915c49935
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
polymer/eduke32/build/src/build.c
View file

@ -540,7 +540,7 @@ int32_t app_main(int32_t argc, const char **argv)
char cmdsetup = 0; char cmdsetup = 0;
#endif #endif
char quitflag; char quitflag;
int32_t i, k; int32_t i;
pathsearchmode = 1; // unrestrict findfrompath so that full access to the filesystem can be had pathsearchmode = 1; // unrestrict findfrompath so that full access to the filesystem can be had
@ -700,7 +700,7 @@ int32_t app_main(int32_t argc, const char **argv)
// Here used to be the 'whitecol' calculation // Here used to be the 'whitecol' calculation
#ifdef HAVE_CLIPSHAPE_FEATURE #ifdef HAVE_CLIPSHAPE_FEATURE
k = clipmapinfo_load(); int k = clipmapinfo_load();
if (k>0) if (k>0)
initprintf("There was an error loading the sprite clipping map (status %d).\n", k); initprintf("There was an error loading the sprite clipping map (status %d).\n", k);
@ -6141,11 +6141,6 @@ end_point_dragging:
} }
else else
{ {
int32_t joink, s1to0wall, s0to1wall;
#ifdef YAX_ENABLE
int16_t jbn[2][2]; // [join index][c/f]
int32_t uneqbn; // unequal bunchnums (bitmap): 1:above, 2:below
#endif
char *origframe = NULL; char *origframe = NULL;
int32_t numjoincandidates = 0; int32_t numjoincandidates = 0;
@ -6175,10 +6170,13 @@ end_point_dragging:
} }
} }
s1to0wall = find_nextwall(i, joinsector[0]);
s0to1wall = wall[s1to0wall].nextwall;
joinsector[1] = i; joinsector[1] = i;
const int s1to0wall = find_nextwall(i, joinsector[0]);
const int s0to1wall = s1to0wall == -1 ? -1 : wall[s1to0wall].nextwall;
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
int16_t jbn[2][2]; // [join index][c/f]
for (k=0; k<2; k++) for (k=0; k<2; k++)
yax_getbunches(joinsector[k], &jbn[k][YAX_CEILING], &jbn[k][YAX_FLOOR]); yax_getbunches(joinsector[k], &jbn[k][YAX_CEILING], &jbn[k][YAX_FLOOR]);
#endif #endif
@ -6216,12 +6214,15 @@ end_point_dragging:
} }
} }
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
uneqbn = (jbn[0][YAX_CEILING]!=jbn[1][YAX_CEILING]) | // unequal bunchnums (bitmap): 1:above, 2:below
((jbn[0][YAX_FLOOR]!=jbn[1][YAX_FLOOR])<<1); int uneqbn =
(jbn[0][YAX_CEILING] != jbn[1][YAX_CEILING]) |
((jbn[0][YAX_FLOOR] != jbn[1][YAX_FLOOR])<<1);
if (uneqbn) if (uneqbn)
{ {
const int32_t cf=YAX_FLOOR; const int32_t cf=YAX_FLOOR;
int32_t whybad=0, jsynw[2]; int32_t whybad=0;
if (uneqbn == 1) if (uneqbn == 1)
{ {
@ -6249,10 +6250,15 @@ end_point_dragging:
uneqbn &= ~(1<<cf), whybad|=4; uneqbn &= ~(1<<cf), whybad|=4;
// check whether the lower neighbors have a red-wall link to each other // check whether the lower neighbors have a red-wall link to each other
jsynw[1] = yax_getnextwall(s1to0wall, cf); const int jsynw[2] = {
jsynw[0] = yax_getnextwall(s0to1wall, cf); yax_getnextwall(s0to1wall, cf),
yax_getnextwall(s1to0wall, cf)
};
if (jsynw[0]<0 || jsynw[1]<0) // this shouldn't happen if (jsynw[0]<0 || jsynw[1]<0) // this shouldn't happen
{
uneqbn &= ~(1<<cf), whybad|=8; uneqbn &= ~(1<<cf), whybad|=8;
}
else if (wall[jsynw[1]].nextwall != jsynw[0]) else if (wall[jsynw[1]].nextwall != jsynw[0])
{ {
// if (find_nextwall(sectorofwall(jsynw[1]), sectorofwall(jsynw[0])) < 0) // if (find_nextwall(sectorofwall(jsynw[1]), sectorofwall(jsynw[0])) < 0)
@ -6394,7 +6400,7 @@ end_point_dragging:
i = j; i = j;
m = newnumwalls; m = newnumwalls;
joink = k; int joink = k;
do do
{ {
if (newnumwalls >= MAXWALLS + M32_FIXME_WALLS) if (newnumwalls >= MAXWALLS + M32_FIXME_WALLS)