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

Fix some bugs in PROP and local saving interfaces

Browse Source
This commit is contained in:
jacob1 2012-08-07 22:54:31 -04:00 committed by jacksonmj
parent af8b8fc3a8
commit cfd1ad6abb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/interface.c
View File

@ -1257,6 +1257,7 @@ char *input_ui(pixel *vid_buf, char *title, char *prompt, char *text, char *shad
void prop_edit_ui(pixel *vid_buf, int x, int y) void prop_edit_ui(pixel *vid_buf, int x, int y)
{ {
pixel * o_vid_buf;
float valuef; float valuef;
unsigned char valuec; unsigned char valuec;
int valuei; int valuei;
@ -1299,6 +1300,9 @@ void prop_edit_ui(pixel *vid_buf, int x, int y)
strncpy(ed2.str, "0", 254); strncpy(ed2.str, "0", 254);
strncpy(ed.str, "ctype", 254); strncpy(ed.str, "ctype", 254);
o_vid_buf = (pixel*)calloc((YRES+MENUSIZE) * (XRES+BARSIZE), PIXELSIZE);
if (o_vid_buf)
memcpy(o_vid_buf, vid_buf, ((YRES+MENUSIZE) * (XRES+BARSIZE)) * PIXELSIZE);
while (!sdl_poll()) while (!sdl_poll())
{ {
b = mouse_get_state(&mx, &my); b = mouse_get_state(&mx, &my);
@ -1311,6 +1315,8 @@ void prop_edit_ui(pixel *vid_buf, int x, int y)
bq = b; bq = b;
b = mouse_get_state(&mx, &my); b = mouse_get_state(&mx, &my);
if (o_vid_buf)
memcpy(vid_buf, o_vid_buf, ((YRES+MENUSIZE) * (XRES+BARSIZE)) * PIXELSIZE);
clearrect(vid_buf, x0-2, y0-2, xsize+4, ysize+4); clearrect(vid_buf, x0-2, y0-2, xsize+4, ysize+4);
drawrect(vid_buf, x0, y0, xsize, ysize, 192, 192, 192, 255); drawrect(vid_buf, x0, y0, xsize, ysize, 192, 192, 192, 255);
drawtext(vid_buf, x0+8, y0+8, "Change particle property", 160, 160, 255, 255); drawtext(vid_buf, x0+8, y0+8, "Change particle property", 160, 160, 255, 255);
@ -1338,7 +1344,7 @@ void prop_edit_ui(pixel *vid_buf, int x, int y)
if (sdl_key==SDLK_RETURN) if (sdl_key==SDLK_RETURN)
break; break;
if (sdl_key==SDLK_ESCAPE) if (sdl_key==SDLK_ESCAPE)
break; goto exit;
} }
if(ed.selected!=-1) if(ed.selected!=-1)
@ -6316,6 +6322,7 @@ int save_filename_ui(pixel *vid_buf)
drawtext(vid_buf, x0+8, y0+ysize-12, "Save", 255, 255, 255, 255); drawtext(vid_buf, x0+8, y0+ysize-12, "Save", 255, 255, 255, 255);
ui_edit_draw(vid_buf, &ed); ui_edit_draw(vid_buf, &ed);
if (strlen(ed.str) || ed.focus)
drawtext(vid_buf, x0+12+textwidth(ed.str), y0+25, ".cps", 240, 240, 255, 180); drawtext(vid_buf, x0+12+textwidth(ed.str), y0+25, ".cps", 240, 240, 255, 180);
#ifdef OGLR #ifdef OGLR
clearScreen(1.0f); clearScreen(1.0f);