diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-07-12 08:35:55 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-07-12 13:48:54 (GMT) |
| commit | 1be79e581d31f1c40051f916128ecbce64f80022 (patch) | |
| tree | e32e4f69e93cb62b182adee46cf3552f487b23fd /src/interface.c | |
| parent | 726acc96a098927e84ecd781f6ecd3043b8f4a2d (diff) | |
| download | powder-1be79e581d31f1c40051f916128ecbce64f80022.zip powder-1be79e581d31f1c40051f916128ecbce64f80022.tar.gz | |
Line snapping (hold down Alt when drawing a line)
Specific element select changed to Ctrl+Alt
Diffstat (limited to 'src/interface.c')
| -rw-r--r-- | src/interface.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/interface.c b/src/interface.c index 64a8991..3f14e7f 100644 --- a/src/interface.c +++ b/src/interface.c @@ -1923,7 +1923,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq drawrect(vid_buf, x+30, y-1, 29, 17, 255, 55, 55, 255); h = n; } - if (!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) + if (!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_CTRL))) { drawrect(vid_buf, x+30, y-1, 29, 17, 0, 255, 255, 255); h = n; @@ -1960,7 +1960,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq drawrect(vid_buf, x+30, y-1, 29, 17, 255, 55, 55, 255); h = n; } - if (!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) + if (!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_CTRL))) { drawrect(vid_buf, x+30, y-1, 29, 17, 0, 255, 255, 255); h = n; @@ -1994,7 +1994,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq drawrect(vid_buf, x+30, y-1, 29, 17, 255, 55, 55, 255); h = n; } - if (!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) + if (!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_CTRL))) { drawrect(vid_buf, x+30, y-1, 29, 17, 0, 255, 255, 255); h = n; @@ -2065,7 +2065,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq drawrect(vid_buf, x+30-xoff, y-1, 29, 17, 255, 55, 55, 255); h = n; } - if (!bq && mx>=x+32-xoff && mx<x+58-xoff && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) + if (!bq && mx>=x+32-xoff && mx<x+58-xoff && my>=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_CTRL))) { drawrect(vid_buf, x+30-xoff, y-1, 29, 17, 0, 255, 255, 255); h = n; @@ -2086,7 +2086,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq } } if (!bq && mx>=((XRES+BARSIZE)-16) ) //highlight menu section - if (sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT)) + if (sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_CTRL)) if (i>=0&&i<SC_TOTAL) SEC = i; @@ -2110,7 +2110,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq //h has the value of the element it is over, and -1 if not over an element if (b==1&&h==-1) { - if (sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT) && SEC>=0) + if (sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_CTRL) && SEC>=0) { SLALT = -1; SEC2 = SEC; @@ -2118,7 +2118,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq } if (b==1&&h!=-1) { - if (sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT)) + if (sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_CTRL)) { SLALT = h; SEC2 = -1; @@ -2130,7 +2130,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq } if (b==4&&h==-1) { - if (sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT) && SEC>=0) + if (sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_CTRL) && SEC>=0) { SLALT = -1; SEC2 = SEC; @@ -2138,7 +2138,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq } if (b==4&&h!=-1) { - if (sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT)) + if (sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_CTRL)) { SLALT = h; SEC2 = -1; @@ -5010,7 +5010,7 @@ unsigned int decorations_ui(pixel *vid_buf,int *bsx,int *bsy, unsigned int saved } else //first click { - if ((sdl_mod & (KMOD_LSHIFT|KMOD_RSHIFT)) && !(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL|KMOD_LALT))) + if ((sdl_mod & (KMOD_SHIFT)) && !(sdl_mod & (KMOD_CTRL))) { lx = mx; ly = my; @@ -5018,7 +5018,7 @@ unsigned int decorations_ui(pixel *vid_buf,int *bsx,int *bsy, unsigned int saved lm = 1;//line } //start box tool - else if ((sdl_mod & (KMOD_LCTRL|KMOD_RCTRL)) && !(sdl_mod & (KMOD_LSHIFT|KMOD_RSHIFT))) + else if ((sdl_mod & (KMOD_CTRL)) && !(sdl_mod & (KMOD_SHIFT|KMOD_ALT))) { lx = mx; ly = my; @@ -5026,7 +5026,7 @@ unsigned int decorations_ui(pixel *vid_buf,int *bsx,int *bsy, unsigned int saved lm = 2;//box } //sample tool - else if (((sdl_mod & (KMOD_LALT|KMOD_RALT)) && !(sdl_mod & (KMOD_SHIFT))) || b==SDL_BUTTON_MIDDLE) + else if (((sdl_mod & (KMOD_ALT)) && !(sdl_mod & (KMOD_SHIFT|KMOD_CTRL))) || b==SDL_BUTTON_MIDDLE) { if (my>=0 && my<YRES && mx>=0 && mx<XRES) { |