summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-04-23 03:11:05 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-04-23 13:00:51 (GMT)
commitbd8de4c8420b7b6dc782d12a0eef1ea3fe6f5883 (patch)
tree8a8b181ab8fcaabfe862e0ae1464c1da9b2bc500 /src/main.c
parentaa3f475edc754ba84b65d83106b91104ac827854 (diff)
downloadpowder-bd8de4c8420b7b6dc782d12a0eef1ea3fe6f5883.zip
powder-bd8de4c8420b7b6dc782d12a0eef1ea3fe6f5883.tar.gz
Decorations! ,still messing with it. It does not save currently. TODO: fix typing in boxes to update the color. Line/box tools. Some basic color selections like an element menu.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index a235131..f98e98c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2658,6 +2658,7 @@ int main(int argc, char *argv[])
PyObject *pname,*pmodule,*pfunc,*pvalue,*pargs,*pstep,*pkey;
PyObject *tpt_console_obj;
#endif
+ pixel *decorations = calloc((XRES+BARSIZE)*YRES, PIXELSIZE);
vid_buf = calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE);
pers_bg = calloc((XRES+BARSIZE)*YRES, PIXELSIZE);
GSPEED = 1;
@@ -3243,6 +3244,8 @@ int main(int argc, char *argv[])
console_mode = !console_mode;
//hud_enable = !console_mode;
}
+ if (sdl_key=='b')
+ decorations_ui(vid_buf,decorations,&bsx,&bsy);//decoration_mode = !decoration_mode;
if (sdl_key=='g')
{
if (sdl_mod & (KMOD_SHIFT))
@@ -3535,7 +3538,7 @@ int main(int argc, char *argv[])
}
}
menu_ui_v3(vid_buf, active_menu, &sl, &sr, &dae, b, bq, x, y); //draw the elements in the current menu
-
+ draw_decorations(vid_buf,decorations);
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)
&& y<sdl_scale*(zoom_wy+ZFACTOR*ZSIZE))