From 54c109168d4233c17deea3ab0dde379a2fce93e4 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sat, 26 Nov 2011 22:40:07 +0000 Subject: [PATCH] New modifier for RAlt. When RShift is depressed while highlighting sectors (i.e. first press RAlt, then hold RShift to make it active), consider all sectors, even the grayed out ones. This makes 6 modifier keys in 4 categories for RAlt. Can you name them all? Also spell out the labels that get drawn near the reticle when applying some of the modifiers and make them not show when not actually selecting (e.g. pressed RShift alone, but have highlighted sectors) git-svn-id: https://svn.eduke32.com/eduke32@2137 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/build.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c index b0a11b947..247cdfdf2 100644 --- a/polymer/eduke32/build/src/build.c +++ b/polymer/eduke32/build/src/build.c @@ -3273,7 +3273,7 @@ void overheadeditor(void) printext16(8,8, editorcolors[13],editorcolors[0],cbuf,0); } - if (keystatus[0x36] || keystatus[0xb8] || keystatus[0x9d]) // RSHIFT || RALT || RCTRL + if (highlightsectorcnt==0 || highlightcnt==0) { if (keystatus[0x27] || keystatus[0x28]) // ' and ; { @@ -3284,13 +3284,17 @@ void overheadeditor(void) drawline16base(searchx+16, searchy-16, 0,-4, 0,+4, col); } - if (keystatus[0x36]) + if (highlightsectorcnt == 0) + if (keystatus[0x36]) + printext16(searchx+6, searchy-2+8,editorcolors[12],-1,"ALL",0); + + if (highlightcnt == 0) { - if (eitherCTRL) - printext16(searchx+6,searchy-6-8,editorcolors[12],-1,"S",0); + if (eitherCTRL && (highlightx1!=highlightx2 || highlighty1!=highlighty2)) + printext16(searchx+6,searchy-6-8,editorcolors[12],-1,"SPR ONLY",0); #ifdef YAX_ENABLE - if (keystatus[0xcf]) - printext16(searchx+6,searchy-6+8,editorcolors[12],-1,"A",0); + if (keystatus[0xcf]) // End + printext16(searchx+6,searchy-2+8,editorcolors[12],-1,"ALL",0); #endif } } @@ -4781,7 +4785,7 @@ end_autoredwall: } else #endif - handlesecthighlight1(i, sub, 0); + handlesecthighlight1(i, sub, eitherSHIFT); } }