teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-21 19:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mapster32: set first walls more conveniently on split in one special case.

Browse source 
Specifically, if the first wall of the sector-to-split is to the left or right
of the *start* of the splitting line AND the sector has no TROR extensions,
make these two the new nextwalls of the respective split sectors.

git-svn-id: https://svn.eduke32.com/eduke32@3157 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-11-13 10:50:13 +00:00
parent 51c544f4da
commit 74c46a7b3d
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5216,7 +5216,7 @@ end_autoredwall:
dragwall[0] = dragwall[1] = -1; dragwall[0] = dragwall[1] = -1;
// attemt to delete some points // attempt to delete some points
for (runi=0; runi<3; runi++) // check, tweak, carry out for (runi=0; runi<3; runi++) // check, tweak, carry out
for (i=numwalls-1; i>=0; i--) for (i=numwalls-1; i>=0; i--)
{ {
@ -6884,10 +6884,15 @@ check_next_sector: ;
int16_t danumwalls, splitendwall, doSectorSplit; int16_t danumwalls, splitendwall, doSectorSplit;
int16_t secondstartwall=-1; // used only with splitting int16_t secondstartwall=-1; // used only with splitting
int32_t expectedNumwalls = numwalls+2*(newnumwalls-numwalls-1), loopnum; int32_t expectedNumwalls = numwalls+2*(newnumwalls-numwalls-1), loopnum;
int32_t firstwallflag;
#ifdef YAX_ENABLE
int16_t cb, fb;
#endif
startwall = sector[ovh.splitsect].wallptr; startwall = sector[ovh.splitsect].wallptr;
endwall = startwall + sector[ovh.splitsect].wallnum - 1; endwall = startwall + sector[ovh.splitsect].wallnum - 1;
firstwallflag = (startwall==ovh.splitstartwall || startwall==lastwall(ovh.splitstartwall));
// OSD_Printf("numwalls: %d, newnumwalls: %d\n", numwalls, newnumwalls); // OSD_Printf("numwalls: %d, newnumwalls: %d\n", numwalls, newnumwalls);
i = -1; i = -1;
for (k=startwall; k<=endwall; k++) for (k=startwall; k<=endwall; k++)
@ -6912,18 +6917,14 @@ check_next_sector: ;
goto end_space_handling; goto end_space_handling;
} }
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
yax_getbunches(ovh.splitsect, &cb, &fb);
if ((cb>=0 && (sector[ovh.splitsect].ceilingstat&2))
|| (fb>=0 && (sector[ovh.splitsect].floorstat&2)))
{ {
int16_t cb, fb; printmessage16("Sloped extended sectors cannot be split.");
newnumwalls--;
yax_getbunches(ovh.splitsect, &cb, &fb); goto end_space_handling;
if ((cb>=0 && (sector[ovh.splitsect].ceilingstat&2))
|| (fb>=0 && (sector[ovh.splitsect].floorstat&2)))
{
printmessage16("Sloped extended sectors cannot be split.");
newnumwalls--;
goto end_space_handling;
}
} }
#endif #endif
////////// common code for splitting/loop joining ////////// ////////// common code for splitting/loop joining //////////
@ -7105,6 +7106,20 @@ check_next_sector: ;
if (numwalls==expectedNumwalls) if (numwalls==expectedNumwalls)
{ {
if (doSectorSplit && cb<0 && fb<0)
{
if (firstwallflag)
{
int32_t rhsnew1stwall = sector[numsectors-2].wallptr;
int32_t lhsotherwall = wall[rhsnew1stwall].nextwall;
Bassert(lhsotherwall >= 0);
setfirstwall(numsectors-2, lastwall(rhsnew1stwall));
setfirstwall(numsectors-1, wall[lhsotherwall].point2);
}
}
message("%s", doSectorSplit ? "Sector split." : "Loops joined."); message("%s", doSectorSplit ? "Sector split." : "Loops joined.");
} }
else else