mirror of
https://github.com/ZDoom/Raze.git
synced 2024-11-16 09:21:36 +00:00
Fix two bugs with the loop punching code that made it practically useless.
git-svn-id: https://svn.eduke32.com/eduke32@2131 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
ee30112c38
commit
235a82f13d
1 changed files with 17 additions and 4 deletions
|
@ -3872,9 +3872,19 @@ void overheadeditor(void)
|
|||
|
||||
// determine start wall
|
||||
for (i=0; i<highlightcnt; i++)
|
||||
if ((highlight[i]&16384)==0 && clockdir(highlight[i])==CLOCKDIR_CCW)
|
||||
{
|
||||
j = highlight[i];
|
||||
|
||||
if (j&16384)
|
||||
continue;
|
||||
|
||||
// we only want loop-starting walls
|
||||
if (j>0 && wall[j-1].point2==j)
|
||||
continue;
|
||||
|
||||
if (clockdir(j)==CLOCKDIR_CCW)
|
||||
{
|
||||
YAX_SKIPWALL(highlight[i]);
|
||||
YAX_SKIPWALL(j);
|
||||
|
||||
if (loopstartwall >= 0)
|
||||
{
|
||||
|
@ -3882,8 +3892,9 @@ void overheadeditor(void)
|
|||
goto end_yax;
|
||||
}
|
||||
|
||||
loopstartwall = highlight[i];
|
||||
loopstartwall = j;
|
||||
}
|
||||
}
|
||||
|
||||
if (loopstartwall == -1)
|
||||
{
|
||||
|
@ -4007,7 +4018,7 @@ void overheadeditor(void)
|
|||
for (SECTORS_OF_BUNCH(bunchnum, !cf, i))
|
||||
for (WALLS_OF_SECTOR(i, j))
|
||||
{
|
||||
if (inside(wall[i].x, wall[i].y, numsectors-1)==1)
|
||||
if (inside(wall[j].x, wall[j].y, numsectors-1)==1)
|
||||
{
|
||||
numsectors--;
|
||||
newnumwalls = -1;
|
||||
|
@ -7802,6 +7813,7 @@ static int32_t checkautoinsert(int32_t dax, int32_t day, int16_t danumwalls)
|
|||
return(0);
|
||||
}
|
||||
|
||||
// wallstart has to be the starting wall of a loop!
|
||||
static int32_t clockdir(int16_t wallstart) //Returns: 0 is CW, 1 is CCW
|
||||
{
|
||||
int16_t i, themin;
|
||||
|
@ -8195,6 +8207,7 @@ static void clearministatbar16(void)
|
|||
enddrawing();
|
||||
}
|
||||
|
||||
// startwall has to be the starting wall of a loop!
|
||||
static int16_t loopinside(int32_t x, int32_t y, int16_t startwall)
|
||||
{
|
||||
int32_t x1, y1, x2, y2;
|
||||
|
|
Loading…
Reference in a new issue