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

Mapster32: make sector flipping (X/Y) work properly with TROR.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2276 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-01-20 22:12:11 +00:00
parent 7a4c9253c5
commit 775eff0344
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1450,7 +1450,7 @@ static void free_n_ptrs(void **ptrptr, int32_t n)
static int32_t backup_highlighted_map(mapinfofull_t *mapinfo) static int32_t backup_highlighted_map(mapinfofull_t *mapinfo)
{ {
int32_t i, j, k, m, tmpnumwalls=0, tmpnumsprites=0; int32_t i, j, k, m, tmpnumwalls=0, tmpnumsprites=0;
int16_t *const otonsect = (int16_t *)tempxyar; int16_t *const otonsect = (int16_t *)tempxyar; // STRICTALIASING
int16_t *const otonwall = ((int16_t *)tempxyar) + MAXWALLS; int16_t *const otonwall = ((int16_t *)tempxyar) + MAXWALLS;
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
int16_t otonbunch[YAX_MAXBUNCHES]; int16_t otonbunch[YAX_MAXBUNCHES];
@ -3298,8 +3298,15 @@ void overheadeditor(void)
#endif #endif
if (highlightsectorcnt > 0) if (highlightsectorcnt > 0)
{ {
int16_t *const otonwall = onextwall; // OK, since we make old-nextwalls invalid
mkonwinvalid();
keystatus[0x2d] = keystatus[0x15] = 0; keystatus[0x2d] = keystatus[0x15] = 0;
for (j=0; j<numwalls; j++)
otonwall[j] = j;
get_sectors_center(highlightsector, highlightsectorcnt, &dax, &day); get_sectors_center(highlightsector, highlightsectorcnt, &dax, &day);
if (gridlock && grid > 0) if (gridlock && grid > 0)
@ -3328,9 +3335,6 @@ void overheadeditor(void)
for (j=startwall; j<=endwall; j++) for (j=startwall; j<=endwall; j++)
{ {
// NEXTWALL tweak: keep nextsector!
wall[j].nextwall = -1;
//fix position of walls //fix position of walls
if (about_x) if (about_x)
{ {
@ -3367,6 +3371,9 @@ void overheadeditor(void)
Bmemcpy(&tempwall, &wall[startofloop+w], sizeof(walltype)); Bmemcpy(&tempwall, &wall[startofloop+w], sizeof(walltype));
Bmemcpy(&wall[startofloop+w], &wall[endofloop-w+1], sizeof(walltype)); Bmemcpy(&wall[startofloop+w], &wall[endofloop-w+1], sizeof(walltype));
Bmemcpy(&wall[endofloop-w+1], &tempwall, sizeof(walltype)); Bmemcpy(&wall[endofloop-w+1], &tempwall, sizeof(walltype));
otonwall[startofloop+w] = endofloop-w+1;
otonwall[endofloop-w+1] = startofloop+w;
} }
//make point2 point to next wall in loop //make point2 point to next wall in loop
@ -3404,14 +3411,23 @@ void overheadeditor(void)
} }
} }
mkonwinvalid(); // finally, construct the nextwalls and yax-nextwalls
// for the new arrangement!
// NEXTWALL tweak: finally, construct the nextwalls for the new arrangement!
for (i=0; i<highlightsectorcnt; i++) for (i=0; i<highlightsectorcnt; i++)
{ {
for (WALLS_OF_SECTOR(i, j)) for (WALLS_OF_SECTOR(i, j))
if (wall[j].nextsector >= 0) {
checksectorpointer(j, highlightsector[i]); if (wall[j].nextwall >= 0)
wall[j].nextwall = otonwall[wall[j].nextwall];
#ifdef YAX_ENABLE
{
int32_t cf, ynw;
for (cf=0; cf<2; cf++)
if ((ynw = yax_getnextwall(j, cf)) >= 0)
yax_setnextwall(j, cf, otonwall[ynw]);
}
#endif
}
} }
printmessage16("Selected sector(s) flipped"); printmessage16("Selected sector(s) flipped");