matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'M' For selected element swap, 'dae' var for showing a selected element box upon element change (not implemented)

Browse Source
This commit is contained in:
Simon 2011-04-17 20:34:54 +01:00
parent 5c8a6f3af8
commit d37bd56eb6
3 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/interface.h
View File

@ -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(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); int sdl_poll(void);

28
src/interface.c
View File

@ -1701,7 +1701,7 @@ void menu_ui(pixel *vid_buf, int i, int *sl, int *sr)
} }
*/ */
//current menu function //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; int h,x,y,n=0,height,width,sy,rows=0,xoff=0,fwidth;
SEC = SEC2; 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; x -= draw_tool_xy(vid_buf, x, y, n, mwalls[n-UI_WALLSTART].colour)+5;
if (!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15) if (!bq && mx>=x+32 && mx<x+58 && my>=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; 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_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) 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) 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; x -= draw_tool_xy(vid_buf, x, y, n, mwalls[n-UI_WALLSTART].colour)+5;
if (!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15) if (!bq && mx>=x+32 && mx<x+58 && my>=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; 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_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) 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) 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; x -= draw_tool_xy(vid_buf, x, y, n, ptypes[n].pcolors)+5;
if (!bq && mx>=x+32 && mx<x+58 && my>=y && my< y+15) if (!bq && mx>=x+32 && mx<x+58 && my>=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; 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_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) 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) 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; x -= draw_tool_xy(vid_buf, x-xoff, y, n, ptypes[n].pcolors)+5;
if (!bq && mx>=x+32-xoff && mx<x+58-xoff && my>=y && my< y+15) if (!bq && mx>=x+32-xoff && mx<x+58-xoff && my>=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; 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_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) 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) 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 { else {
*sl = h; *sl = h;
*dae = 51;
} }
} }
if (b==4&&h==-1) 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 { else {
*sr = h; *sr = h;
*dae = 51;
} }
} }
} }

17
src/main.c
View File

@ -2646,7 +2646,7 @@ int main(int argc, char *argv[])
#endif #endif
int wavelength_gfx = 0; 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 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; float nfvx, nfvy;
int load_mode=0, load_w=0, load_h=0, load_x=0, load_y=0, load_size=0; int load_mode=0, load_w=0, load_h=0, load_x=0, load_y=0, load_size=0;
void *load_data=NULL; void *load_data=NULL;
@ -3248,6 +3248,16 @@ int main(int argc, char *argv[])
else else
GRID_MODE = (GRID_MODE+1)%10; GRID_MODE = (GRID_MODE+1)%10;
} }
if (sdl_key=='m')
{
if(sl!=sr)
{
sl ^= sr;
sr ^= sl;
sl ^= sr;
}
dae = 51;
}
if (sdl_key=='=') if (sdl_key=='=')
{ {
int nx, ny; int nx, ny;
@ -3522,7 +3532,7 @@ int main(int argc, char *argv[])
active_menu = i; 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 if (zoom_en && x>=sdl_scale*zoom_wx && y>=sdl_scale*zoom_wy //change mouse position while it is in a zoom window
&& x<sdl_scale*(zoom_wx+ZFACTOR*ZSIZE) && x<sdl_scale*(zoom_wx+ZFACTOR*ZSIZE)
@ -3718,6 +3728,9 @@ int main(int argc, char *argv[])
else if (da > 0)//fade away mouseover text else if (da > 0)//fade away mouseover text
da --; da --;
if (dae > 0) //Fade away selected elements
dae --;
if (!sdl_zoom_trig && zoom_en==1) if (!sdl_zoom_trig && zoom_en==1)
zoom_en = 0; zoom_en = 0;