zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

set op support for loop highlighting with RCtrl-RShift

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1896 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-05-24 21:46:51 +00:00
parent 68dff06533
commit 480df8187b
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2701,7 +2701,7 @@ void overheadeditor(void)
printext16(8,8, editorcolors[13],editorcolors[0],cbuf,0); printext16(8,8, editorcolors[13],editorcolors[0],cbuf,0);
} }
if (keystatus[0x36] || keystatus[0xb8]) // RSHIFT || RALT if (keystatus[0x36] || keystatus[0xb8] || keystatus[0x9d]) // RSHIFT || RALT || RCTRL
{ {
if (keystatus[0x27] || keystatus[0x28]) // ' and ; if (keystatus[0x27] || keystatus[0x28]) // ' and ;
{ {
@ -2711,8 +2711,7 @@ void overheadeditor(void)
if (keystatus[0x28]) if (keystatus[0x28])
drawline16base(searchx+16, searchy-16, 0,-4, 0,+4, col); drawline16base(searchx+16, searchy-16, 0,-4, 0,+4, col);
} }
else if (keystatus[0x36] && eitherCTRL)
if (keystatus[0x36] && eitherCTRL)
printext16(searchx+6,searchy-6-8,editorcolors[12],-1,"S",0); printext16(searchx+6,searchy-6-8,editorcolors[12],-1,"S",0);
} }
@ -3342,6 +3341,8 @@ end_yax: ;
{ {
if (highlightcnt == 0) if (highlightcnt == 0)
{ {
int32_t add=keystatus[0x28], sub=(!add && keystatus[0x27]), setop=(add||sub);
if (!m32_sideview) if (!m32_sideview)
{ {
getpoint(highlightx1,highlighty1, &highlightx1,&highlighty1); getpoint(highlightx1,highlighty1, &highlightx1,&highlighty1);
@ -3356,19 +3357,30 @@ end_yax: ;
// Ctrl+RShift: select all wall-points of highlighted wall's loop: // Ctrl+RShift: select all wall-points of highlighted wall's loop:
if (eitherCTRL && highlightx1==highlightx2 && highlighty1==highlighty2) if (eitherCTRL && highlightx1==highlightx2 && highlighty1==highlighty2)
{ {
Bmemset(show2dwall, 0, sizeof(show2dwall)); if (!setop)
Bmemset(show2dsprite, 0, sizeof(show2dsprite)); {
Bmemset(show2dwall, 0, sizeof(show2dwall));
Bmemset(show2dsprite, 0, sizeof(show2dsprite));
}
if (linehighlight >= 0 && linehighlight < MAXWALLS) if (linehighlight >= 0 && linehighlight < MAXWALLS)
{ {
i = linehighlight; i = linehighlight;
do do
{ {
show2dwall[i>>3] |= (1<<(i&7)); if (!sub)
show2dwall[i>>3] |= (1<<(i&7));
else
show2dwall[i>>3] &= ~(1<<(i&7));
for (j=0; j<numwalls; j++) for (j=0; j<numwalls; j++)
if (j!=i && wall[j].x==wall[i].x && wall[j].y==wall[i].y) if (j!=i && wall[j].x==wall[i].x && wall[j].y==wall[i].y)
show2dwall[j>>3] |= (1<<(j&7)); {
if (!sub)
show2dwall[j>>3] |= (1<<(j&7));
else
show2dwall[j>>3] &= ~(1<<(j&7));
}
i = wall[i].point2; i = wall[i].point2;
} }
@ -3379,7 +3391,6 @@ end_yax: ;
} }
else else
{ {
int32_t add=keystatus[0x28], sub=(!add && keystatus[0x27]), setop=(add||sub);
int32_t tx, ty, onlySprites=eitherCTRL; int32_t tx, ty, onlySprites=eitherCTRL;
if (!setop) if (!setop)
@ -3413,7 +3424,7 @@ end_yax: ;
{ {
if (!sub) if (!sub)
show2dwall[i>>3] |= (1<<(i&7)); show2dwall[i>>3] |= (1<<(i&7));
else if (sub) else
show2dwall[i>>3] &= ~(1<<(i&7)); show2dwall[i>>3] &= ~(1<<(i&7));
} }
} }