diff --git a/includes/interface.h b/includes/interface.h index 0cef471c3..fec1a60c0 100644 --- a/includes/interface.h +++ b/includes/interface.h @@ -205,7 +205,7 @@ int save_name_ui(pixel *vid_buf); void menu_ui(pixel *vid_buf, int i, int *sl, int *sr); -void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, int my); +void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq, int mx, int my); int sdl_poll(void); diff --git a/src/interface.c b/src/interface.c index fb23073c2..86d389b94 100644 --- a/src/interface.c +++ b/src/interface.c @@ -1701,7 +1701,7 @@ void menu_ui(pixel *vid_buf, int i, int *sl, int *sr) } */ //current menu function -void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, int my) +void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int *dae, int b, int bq, int mx, int my) { int h,x,y,n=0,height,width,sy,rows=0,xoff=0,fwidth; SEC = SEC2; @@ -1729,7 +1729,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, x -= draw_tool_xy(vid_buf, x, y, n, mwalls[n-UI_WALLSTART].colour)+5; if (!bq && mx>=x+32 && mx=y && my< y+15) { - drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255); + drawrect(vid_buf, x+30, y-1, 29, 17, 255, 55, 55, 255); h = n; } if (!bq && mx>=x+32 && mx=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) @@ -1743,11 +1743,11 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, } else if (n==*sl) { - drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255); + drawrect(vid_buf, x+30, y-1, 29, 17, 255, 55, 55, 255); } else if (n==*sr) { - drawrect(vid_buf, x+30, y-1, 29, 17, 0, 0, 255, 255); + drawrect(vid_buf, x+30, y-1, 29, 17, 55, 55, 255, 255); } } } @@ -1766,7 +1766,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, x -= draw_tool_xy(vid_buf, x, y, n, mwalls[n-UI_WALLSTART].colour)+5; if (!bq && mx>=x+32 && mx=y && my< y+15) { - drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255); + drawrect(vid_buf, x+30, y-1, 29, 17, 255, 55, 55, 255); h = n; } if (!bq && mx>=x+32 && mx=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) @@ -1780,11 +1780,11 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, } else if (n==*sl) { - drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255); + drawrect(vid_buf, x+30, y-1, 29, 17, 255, 55, 55, 255); } else if (n==*sr) { - drawrect(vid_buf, x+30, y-1, 29, 17, 0, 0, 255, 255); + drawrect(vid_buf, x+30, y-1, 29, 17, 55, 55, 255, 255); } } } @@ -1800,7 +1800,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, x -= draw_tool_xy(vid_buf, x, y, n, ptypes[n].pcolors)+5; if (!bq && mx>=x+32 && mx=y && my< y+15) { - drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255); + drawrect(vid_buf, x+30, y-1, 29, 17, 255, 55, 55, 255); h = n; } if (!bq && mx>=x+32 && mx=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) @@ -1814,11 +1814,11 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, } else if (n==*sl) { - drawrect(vid_buf, x+30, y-1, 29, 17, 255, 0, 0, 255); + drawrect(vid_buf, x+30, y-1, 29, 17, 255, 55, 55, 255); } else if (n==*sr) { - drawrect(vid_buf, x+30, y-1, 29, 17, 0, 0, 255, 255); + drawrect(vid_buf, x+30, y-1, 29, 17, 55, 55, 255, 255); } } } @@ -1836,7 +1836,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, x -= draw_tool_xy(vid_buf, x-xoff, y, n, ptypes[n].pcolors)+5; if (!bq && mx>=x+32-xoff && mx=y && my< y+15) { - drawrect(vid_buf, x+30-xoff, y-1, 29, 17, 255, 0, 0, 255); + drawrect(vid_buf, x+30-xoff, y-1, 29, 17, 255, 55, 55, 255); h = n; } if (!bq && mx>=x+32-xoff && mx=y && my< y+15&&(sdl_mod & (KMOD_LALT) && sdl_mod & (KMOD_SHIFT))) @@ -1850,11 +1850,11 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, } else if (n==*sl) { - drawrect(vid_buf, x+30-xoff, y-1, 29, 17, 255, 0, 0, 255); + drawrect(vid_buf, x+30-xoff, y-1, 29, 17, 255, 55, 55, 255); } else if (n==*sr) { - drawrect(vid_buf, x+30-xoff, y-1, 29, 17, 0, 0, 255, 255); + drawrect(vid_buf, x+30-xoff, y-1, 29, 17, 55, 55, 255, 255); } } } @@ -1895,6 +1895,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, } else { *sl = h; + *dae = 51; } } if (b==4&&h==-1) @@ -1914,6 +1915,7 @@ void menu_ui_v3(pixel *vid_buf, int i, int *sl, int *sr, int b, int bq, int mx, } else { *sr = h; + *dae = 51; } } } diff --git a/src/main.c b/src/main.c index c06af767d..f1f26bb0e 100644 --- a/src/main.c +++ b/src/main.c @@ -2646,7 +2646,7 @@ int main(int argc, char *argv[]) #endif int wavelength_gfx = 0; int x, y, b = 0, sl=1, sr=0, su=0, c, lb = 0, lx = 0, ly = 0, lm = 0;//, tx, ty; - int da = 0, db = 0, it = 2047, mx, my, bsx = 2, bsy = 2; + int da = 0, dae = 0, db = 0, it = 2047, mx, my, bsx = 2, bsy = 2; float nfvx, nfvy; int load_mode=0, load_w=0, load_h=0, load_x=0, load_y=0, load_size=0; void *load_data=NULL; @@ -3248,6 +3248,16 @@ int main(int argc, char *argv[]) else GRID_MODE = (GRID_MODE+1)%10; } + if (sdl_key=='m') + { + if(sl!=sr) + { + sl ^= sr; + sr ^= sl; + sl ^= sr; + } + dae = 51; + } if (sdl_key=='=') { int nx, ny; @@ -3522,7 +3532,7 @@ int main(int argc, char *argv[]) active_menu = i; } } - menu_ui_v3(vid_buf, active_menu, &sl, &sr, b, bq, x, y); //draw the elements in the current menu + menu_ui_v3(vid_buf, active_menu, &sl, &sr, &dae, b, bq, x, y); //draw the elements in the current menu if (zoom_en && x>=sdl_scale*zoom_wx && y>=sdl_scale*zoom_wy //change mouse position while it is in a zoom window && x 0)//fade away mouseover text da --; + if (dae > 0) //Fade away selected elements + dae --; + if (!sdl_zoom_trig && zoom_en==1) zoom_en = 0;