diff --git a/src/interface.c b/src/interface.c index 81b5ed6af..2161bcb1c 100644 --- a/src/interface.c +++ b/src/interface.c @@ -1497,7 +1497,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255); h = n; } - if(!bq && mx>=x+32 && mx=y && my< y+15&&(sdl_mod & (KMOD_LALT))) + if(!bq && mx>=x+32 && mx=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) { drawrect(vid_buf, x+30, y-1, 29, 17, 0, 255, 255, 255); h = n; @@ -1531,7 +1531,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255); h = n; } - if(!bq && mx>=x+32 && mx=y && my< y+15&&(sdl_mod & (KMOD_LALT))) + if(!bq && mx>=x+32 && mx=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) { drawrect(vid_buf, x+30, y-1, 29, 17, 0, 255, 255, 255); h = n; @@ -1568,7 +1568,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255); h = n; } - if(!bq && mx>=x+32 && mx=y && my< y+15&&(sdl_mod & (KMOD_LALT))) + if(!bq && mx>=x+32 && mx=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) { drawrect(vid_buf, x+30, y-1, 29, 17, 0, 255, 255, 255); h = n; @@ -1604,7 +1604,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, if(b==1&&h!=-1) { - if(sdl_mod & (KMOD_LALT)) + if(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT)) { SLALT = h; } @@ -1614,7 +1614,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, } if(b==4&&h!=-1) { - if(sdl_mod & (KMOD_LALT)) + if(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT)) { SLALT = h; } diff --git a/src/main.c b/src/main.c index 5ef9ce304..af9dcc6ba 100644 --- a/src/main.c +++ b/src/main.c @@ -1833,7 +1833,7 @@ int main(int argc, char *argv[]) } else { - if((sdl_mod & (KMOD_LSHIFT|KMOD_RSHIFT)) && !(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL))) + if((sdl_mod & (KMOD_LSHIFT|KMOD_RSHIFT)) && !(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL|KMOD_LALT))) { lx = x; ly = y; @@ -1856,7 +1856,7 @@ int main(int argc, char *argv[]) lb = 0; lm = 0; } - else if((sdl_mod & (KMOD_LALT||KMOD_RALT)) || b==SDL_BUTTON_MIDDLE) + else if(((sdl_mod & (KMOD_LALT||KMOD_RALT)) && !sdl_mod & (KMOD_LALT)) || b==SDL_BUTTON_MIDDLE) { if(y>0 && y0 && x