mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-16 09:21:12 +00:00
Three Mapster32 changes (2 wall-drawing related, 1 crash fix)
- Don't crash when sector joining fails under certain circumstances. - Increase the point lock (Manhattan) distance from 1/16th to 1/8th of the grid square length, making it easier to snap to vertices not lying at the grid points with grid lock on - When drawing walls, don't snap to any of them except the first drawn git-svn-id: https://svn.eduke32.com/eduke32@2126 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
45bcc11f46
commit
53bbb48675
1 changed files with 9 additions and 5 deletions
|
@ -2767,7 +2767,7 @@ void overheadeditor(void)
|
|||
// if we're in the process of drawing a wall, set the end point's coordinates
|
||||
dax = mousxplc;
|
||||
day = mousyplc;
|
||||
adjustmark(&dax,&day,newnumwalls);
|
||||
adjustmark(&dax,&day,numwalls+!ovh.split);
|
||||
wall[newnumwalls].x = dax;
|
||||
wall[newnumwalls].y = day;
|
||||
}
|
||||
|
@ -5177,6 +5177,12 @@ end_point_dragging:
|
|||
{
|
||||
if (!bakframe_fillandfade(&origframe, i, "Use this as second joining sector? (Y/N)"))
|
||||
continue;
|
||||
|
||||
if (origframe)
|
||||
{
|
||||
Bfree(origframe);
|
||||
origframe = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
s1to0wall = find_nextwall(i, joinsector[0]);
|
||||
|
@ -5490,11 +5496,9 @@ end_point_dragging:
|
|||
}
|
||||
|
||||
joinsector[0] = -1;
|
||||
end_join_sectors:
|
||||
if (origframe)
|
||||
Bfree(origframe);
|
||||
}
|
||||
}
|
||||
end_join_sectors:
|
||||
|
||||
// PK
|
||||
for (i=0x02; i<=0x0b; i++) // keys '1' to '0' on the upper row
|
||||
|
@ -7458,7 +7462,7 @@ static int32_t adjustmark(int32_t *xplc, int32_t *yplc, int16_t danumwalls)
|
|||
|
||||
pointlockdist = 0;
|
||||
if (grid > 0 && gridlock)
|
||||
pointlockdist = (128>>grid);
|
||||
pointlockdist = (256>>grid);
|
||||
|
||||
dist = pointlockdist;
|
||||
dax = *xplc;
|
||||
|
|
Loading…
Reference in a new issue