From e18337a70ab7d4b1560d909b1375959c9bed7e7b Mon Sep 17 00:00:00 2001 From: Cracker64 Date: Sun, 30 Jan 2011 01:23:24 -0500 Subject: [PATCH 1/2] Added a console! it is pretty self explanitory --- includes/defines.h | 1 + includes/interface.h | 2 + src/interface.c | 48 ++++++++ src/main.c | 258 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 307 insertions(+), 2 deletions(-) diff --git a/includes/defines.h b/includes/defines.h index 43b259846..c22180f1d 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -139,6 +139,7 @@ int gol[XRES][YRES]; int gol2[XRES][YRES][NGOL]; int SEC; int SEC2; +int console_mode; int REPLACE_MODE; int CURRENT_BRUSH; int GRID_MODE; diff --git a/includes/interface.h b/includes/interface.h index 4bee583dd..0fa6e4087 100644 --- a/includes/interface.h +++ b/includes/interface.h @@ -224,5 +224,7 @@ void open_link(char *uri); int report_ui(pixel *vid_buf, char *save_id); +char *console_ui(pixel *vid_buf); + #endif diff --git a/src/interface.c b/src/interface.c index 05016c278..bbb7c2d82 100644 --- a/src/interface.c +++ b/src/interface.c @@ -3789,3 +3789,51 @@ void open_link(char *uri) { printf("Cannot open browser\n"); #endif } +char *console_ui(pixel *vid_buf) { //TODO: error messages, show previous commands + int mx,my,b,bq; + ui_edit ed; + ed.x = 15; + ed.y = 210; + ed.w = XRES; + ed.nx = 1; + ed.def = ""; + strcpy(ed.str, ""); + ed.focus = 1; + ed.hide = 0; + ed.multiline = 0; + ed.cursor = 0; + //fillrect(vid_buf, -1, -1, XRES, 220, 0, 0, 0, 190); + while (!sdl_poll()) + { + bq = b; + b = SDL_GetMouseState(&mx, &my); + mx /= sdl_scale; + my /= sdl_scale; + ed.focus = 1; + + clearrect(vid_buf, 0, 0, XRES+BARSIZE, 220);//anyway to make it transparent? + draw_line(vid_buf, 1, 219, XRES, 219, 228, 228, 228, XRES+BARSIZE); + drawtext(vid_buf, 15, 15, "Welcome to The Powder Toy console v.1 (by cracker64)\n" + "Current commands are quit, set, reset\n" + "You can set type, temp, ctype, life, x, y, vx, vy using this format ('set life particle# 9001')\n" + "You can also use 'all' instead of a particle number to do it to everything\n" + "Reset works with pressure, velocity, sparks, temp (ex. 'reset pressure')" + ,255, 187, 187, 255); + ui_edit_draw(vid_buf, &ed); + ui_edit_process(mx, my, b, &ed); + sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE)); + if (sdl_key==SDLK_RETURN) + { + return ed.str; + } + if (sdl_key==SDLK_ESCAPE || sdl_key==SDLK_BACKQUOTE) + { + console_mode = 0; + return NULL; + } + + } + + +} + diff --git a/src/main.c b/src/main.c index 77cd7e62b..37a4ce98b 100644 --- a/src/main.c +++ b/src/main.c @@ -1483,8 +1483,13 @@ int main(int argc, char *argv[]) } if ((sdl_mod & (KMOD_RCTRL) )&&( sdl_mod & (KMOD_RALT))) active_menu = 11; - if (sdl_key==SDLK_INSERT || sdl_key==SDLK_BACKQUOTE) + if (sdl_key==SDLK_INSERT)// || sdl_key==SDLK_BACKQUOTE) REPLACE_MODE = !REPLACE_MODE; + if (sdl_key==SDLK_BACKQUOTE) + { + console_mode = !console_mode; + hud_enable = !console_mode; + } if (sdl_key=='g') { if (sdl_mod & (KMOD_SHIFT)) @@ -1686,6 +1691,255 @@ int main(int argc, char *argv[]) }*/ } } + if(console_mode) + { + int nx,ny; + char *console; + char *console2; + char *console3; + char *console4; + char *console5; + sys_pause = 1; + console = console_ui(vid_buf); + if(console && strcmp(console, "")!=0 && strncmp(console, " ", 1)!=0) + { + console2 = strtok(console, " "); + console3 = strtok(NULL, " "); + console4 = strtok(NULL, " "); + console5 = strtok(NULL, " "); + if(strcmp(console2, "quit")==0) + { + break; + } + else if(strcmp(console2, "reset")==0 && console3) + { + if(strcmp(console3, "pressure")==0) + { + for (nx = 0; nx>8].ctype; if (tctype>=PT_NUM) tctype = 0; - sprintf(heattext, "%s (%s), Pressure: %3.2f, Temp: %4.2f C, Life: %d, Tmp: %d", ptypes[cr&0xFF].name, ptypes[tctype].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f, parts[cr>>8].life ,parts[cr>>8].tmp); + sprintf(heattext, "%s (%s), Pressure: %3.2f, Temp: %4.2f C, Life: %d, #%d", ptypes[cr&0xFF].name, ptypes[tctype].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f, parts[cr>>8].life ,cr>>8); //sprintf(heattext, "%s (%s), Pressure: %3.2f, Temp: %4.2f C, Life: %d", ptypes[cr&0xFF].name, ptypes[parts[cr>>8].ctype].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f, parts[cr>>8].life); } else { sprintf(heattext, "%s, Pressure: %3.2f, Temp: %4.2f C", ptypes[cr&0xFF].name, pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL], parts[cr>>8].temp-273.15f); From fcf958da21621887a80249f2af863991544815fd Mon Sep 17 00:00:00 2001 From: Cracker64 Date: Sun, 30 Jan 2011 15:00:54 -0500 Subject: [PATCH 2/2] added 'load' command, and a basic error message. --- includes/interface.h | 2 +- src/interface.c | 9 ++++++--- src/main.c | 16 +++++++++++++++- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/includes/interface.h b/includes/interface.h index 0fa6e4087..986d5e4a5 100644 --- a/includes/interface.h +++ b/includes/interface.h @@ -224,7 +224,7 @@ void open_link(char *uri); int report_ui(pixel *vid_buf, char *save_id); -char *console_ui(pixel *vid_buf); +char *console_ui(pixel *vid_buf, char error[255]); #endif diff --git a/src/interface.c b/src/interface.c index bbb7c2d82..6f3f0bc4f 100644 --- a/src/interface.c +++ b/src/interface.c @@ -3789,7 +3789,7 @@ void open_link(char *uri) { printf("Cannot open browser\n"); #endif } -char *console_ui(pixel *vid_buf) { //TODO: error messages, show previous commands +char *console_ui(pixel *vid_buf,char error[255]) { //TODO: error messages, show previous commands int mx,my,b,bq; ui_edit ed; ed.x = 15; @@ -3814,11 +3814,14 @@ char *console_ui(pixel *vid_buf) { //TODO: error messages, show previous command clearrect(vid_buf, 0, 0, XRES+BARSIZE, 220);//anyway to make it transparent? draw_line(vid_buf, 1, 219, XRES, 219, 228, 228, 228, XRES+BARSIZE); drawtext(vid_buf, 15, 15, "Welcome to The Powder Toy console v.1 (by cracker64)\n" - "Current commands are quit, set, reset\n" + "Current commands are quit, set, reset, load\n" "You can set type, temp, ctype, life, x, y, vx, vy using this format ('set life particle# 9001')\n" "You can also use 'all' instead of a particle number to do it to everything\n" - "Reset works with pressure, velocity, sparks, temp (ex. 'reset pressure')" + "Reset works with pressure, velocity, sparks, temp (ex. 'reset pressure')\n" + "To load a save use load saveID (ex. load 1337)" ,255, 187, 187, 255); + if(error) + drawtext(vid_buf, 15, 190, error,255, 187, 187, 255); ui_edit_draw(vid_buf, &ed); ui_edit_process(mx, my, b, &ed); sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE)); diff --git a/src/main.c b/src/main.c index 37a4ce98b..6f7ee7b4a 100644 --- a/src/main.c +++ b/src/main.c @@ -1117,6 +1117,7 @@ int main(int argc, char *argv[]) pixel *pers_bg=calloc((XRES+BARSIZE)*YRES, PIXELSIZE); void *http_ver_check; char *ver_data=NULL, *tmp; + char error[255]; int i, j, bq, fire_fc=0, do_check=0, old_version=0, http_ret=0, major, minor, old_ver_len; #ifdef INTERNAL int vs = 0; @@ -1699,8 +1700,10 @@ int main(int argc, char *argv[]) char *console3; char *console4; char *console5; + //char error[255] = "error!"; sys_pause = 1; - console = console_ui(vid_buf); + console = console_ui(vid_buf,error); + strcpy(error,""); if(console && strcmp(console, "")!=0 && strncmp(console, " ", 1)!=0) { console2 = strtok(console, " "); @@ -1711,6 +1714,15 @@ int main(int argc, char *argv[]) { break; } + else if(strcmp(console2, "load")==0 && console3) + { + j = atoi(console3); + if(j) + { + open_ui(vid_buf, console3, NULL); + console_mode = 0; + } + } else if(strcmp(console2, "reset")==0 && console3) { if(strcmp(console3, "pressure")==0) @@ -1936,6 +1948,8 @@ int main(int argc, char *argv[]) } } } + else + sprintf(error, "Invalid Command", console2); } if(!console_mode) hud_enable = 1;