From c1ca8bae2980fba045fbd881a18a9e75c14361aa Mon Sep 17 00:00:00 2001 From: Cracker64 Date: Mon, 31 Jan 2011 13:12:29 -0500 Subject: [PATCH] merge jacksonmj's and simon's changes, and made mouse coords show up in debug so it is easier to get them. --- includes/interface.h | 5 +- includes/misc.h | 2 + src/graphics.c | 19 +++++- src/interface.c | 147 +++++++++++++++++++++++++++++++++++-------- src/main.c | 131 ++++++++++++++++++++++++-------------- src/misc.c | 13 ++++ 6 files changed, 239 insertions(+), 78 deletions(-) diff --git a/includes/interface.h b/includes/interface.h index 870e917e1..2cb64dd2d 100644 --- a/includes/interface.h +++ b/includes/interface.h @@ -227,8 +227,9 @@ void open_link(char *uri); int report_ui(pixel *vid_buf, char *save_id); char *console_ui(pixel *vid_buf, char error[255]); - -int console_get_type(char *element); +int console_parse_coords(char *txt, int *x, int *y, char *err); +int console_parse_type(char *txt, int *element, char *err); +int console_parse_partref(char *txt, int *which, char *err); #endif diff --git a/includes/misc.h b/includes/misc.h index 7efb3f14d..4094b3931 100644 --- a/includes/misc.h +++ b/includes/misc.h @@ -59,6 +59,8 @@ void load_presets(void); void save_string(FILE *f, char *str); +int sregexp(const char *str, char *pattern); + int load_string(FILE *f, char *str, int max); void strcaturl(char *dst, char *src); diff --git a/src/graphics.c b/src/graphics.c index b18a65929..786bdca2b 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -2885,10 +2885,10 @@ void draw_parts(pixel *vid) void render_signs(pixel *vid_buf) { int i, j, x, y, w, h, dx, dy,mx,my,b=1,bq; - char buff[30]; //Buffer for (i=0; iprev_command; - } else if(currentcommand->prev_command!=NULL){ + } else if(currentcommand->prev_command!=NULL) { free(currentcommand->prev_command); currentcommand->prev_command = NULL; } cc++; - } + } else { break; } } - + if(error) drawtext(vid_buf, 15, 190, error,255, 187, 187, 255); ui_edit_draw(vid_buf, &ed); @@ -3905,18 +3923,18 @@ char *console_ui(pixel *vid_buf,char error[255]) { //TODO: error messages, show } else { - if(last_command!=NULL){ + if(last_command!=NULL) { currentcommand = last_command; for (cc = 0; ccprev_command==NULL) ci = cc; - else + else currentcommand = currentcommand->prev_command; } strcpy(ed.str, currentcommand->command); ed.cursor = strlen(ed.str); } - else + else { ci = -1; strcpy(ed.str, ""); @@ -3924,26 +3942,101 @@ char *console_ui(pixel *vid_buf,char error[255]) { //TODO: error messages, show } } } - } - - + return NULL; } -int console_get_type(char *element) +int console_parse_type(char *txt, int *element, char *err) { - int i; + int i = atoi(txt); char num[4]; - i = atoi(element); - sprintf(num,"%d",i); - if (i>=0 && i=0 && i=0) + { + *element = i; + return 1; + } + for (i=1; i=0 && nx=0 && ny>8)>=NPART) + i = -1; + else + i = i>>8; + } + else if (txt) + { + char *num = (char*)malloc(strlen(txt)+3); + strcpy(err,""); // suppress error message from failed coordinate parsing + i = atoi(txt); + sprintf(num,"%d",i); + if (!txt || strcmp(txt,num)!=0) + i = -1; + free(num); + } + if (i>=0 && i=PT_NUM) tctype = 0; 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(coordtext, "X:%d Y:%d", x/sdl_scale, y/sdl_scale); //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); @@ -1773,6 +1775,8 @@ int main(int argc, char *argv[]) } else { + if (DEBUG_MODE) + sprintf(coordtext, "X:%d Y:%d", x/sdl_scale, y/sdl_scale); sprintf(heattext, "Empty, Pressure: %3.2f", pv[(y/sdl_scale)/CELL][(x/sdl_scale)/CELL]); } } @@ -2159,8 +2163,37 @@ int main(int argc, char *argv[]) } else if (y=signx && x<=signx+signw && y>=signy && y<=signy+signh) + { + char buff[256]; + int sldr; + + memset(buff, 0, sizeof(buff)); + + for(sldr=3; signs[signi].text[sldr] != '|'; sldr++) + buff[sldr-3] = signs[signi].text[sldr]; + + char buff2[sldr-2]; //TODO: Fix this for Visual Studio + memset(buff2, 0, sizeof(buff2)); + memcpy(&buff2, &buff, sldr-3); + open_ui(vid_buf, buff2, 0); + } + } + } + if (c==WL_SIGN+100) { if (!bq) @@ -2465,17 +2498,32 @@ int main(int argc, char *argv[]) { fillrect(vid_buf, XRES-20-textwidth(heattext), 266, textwidth(heattext)+8, 15, 0, 0, 0, 140); drawtext(vid_buf, XRES-16-textwidth(heattext), 270, heattext, 255, 255, 255, 200); + if(DEBUG_MODE) + { + fillrect(vid_buf, XRES-20-textwidth(coordtext), 280, textwidth(coordtext)+8, 13, 0, 0, 0, 140); + drawtext(vid_buf, XRES-16-textwidth(coordtext), 282, coordtext, 255, 255, 255, 200); + } } else { fillrect(vid_buf, 12, 266, textwidth(heattext)+8, 15, 0, 0, 0, 140); drawtext(vid_buf, 16, 270, heattext, 255, 255, 255, 200); + if(DEBUG_MODE) + { + fillrect(vid_buf, 12, 280, textwidth(coordtext)+8, 13, 0, 0, 0, 140); + drawtext(vid_buf, 16, 282, coordtext, 255, 255, 255, 200); + } } } else { fillrect(vid_buf, XRES-20-textwidth(heattext), 12, textwidth(heattext)+8, 15, 0, 0, 0, 140); drawtext(vid_buf, XRES-16-textwidth(heattext), 16, heattext, 255, 255, 255, 200); + if(DEBUG_MODE) + { + fillrect(vid_buf, XRES-20-textwidth(coordtext), 26, textwidth(coordtext)+8, 11, 0, 0, 0, 140); + drawtext(vid_buf, XRES-16-textwidth(coordtext), 27, coordtext, 255, 255, 255, 200); + } } fillrect(vid_buf, 12, 12, textwidth(uitext)+8, 15, 0, 0, 0, 140); drawtext(vid_buf, 16, 16, uitext, 32, 216, 255, 200); @@ -2503,7 +2551,7 @@ int main(int argc, char *argv[]) http_done(); return 0; } -int process_command(pixel *vid_buf,char *console,char *console_error) { //TODO: delete with coords, have 'set' work with coords as well +int process_command(pixel *vid_buf,char *console,char *console_error) { int nx,ny,i,j; char *console2; @@ -2556,17 +2604,21 @@ char *console5; console_mode = 0; } } - else if(strcmp(console2, "create")==0 && console3 && console4 && console5) + else if (strcmp(console2, "create")==0 && console3 && console4) { - j = console_get_type(console3); - if (j<0) - sprintf(console_error, "Particle type not recognised", console2); - nx = atoi(console4); - ny = atoi(console5); - if(ny < 0 || nx < 0 || ny > YRES || nx > XRES) - sprintf(console_error, "Invalid Coordinates", console2); - else - create_part(-1,nx,ny,j); + if (console_parse_type(console3, &j, console_error) + && console_parse_coords(console4, &nx, &ny, console_error)) + { + if (!j) + strcpy(console_error, "Cannot create particle with type NONE"); + else if (create_part(-1,nx,ny,j)<0) + strcpy(console_error, "Could not create particle"); + } + } + else if ((strcmp(console2, "delete")==0 || strcmp(console2, "kill")==0) && console3) + { + if (console_parse_partref(console3, &i, console_error)) + kill_part(i); } else if(strcmp(console2, "reset")==0 && console3) { @@ -2624,8 +2676,7 @@ char *console5; } else { - i = atoi(console4); - if(parts[i].type) + if (console_parse_partref(console4, &i, console_error)) { j = atoi(console5); parts[i].life = j; @@ -2636,10 +2687,7 @@ char *console5; { if(strcmp(console4, "all")==0) { - j = console_get_type(console5); - if (j<0) - sprintf(console_error, "Particle type not recognised", console2); - else + if (console_parse_type(console5, &j, console_error)) for(i=0; i #include #include +#include +#include #include "misc.h" #include "defines.h" #include "interface.h" @@ -116,6 +118,17 @@ void save_presets(int do_update) fclose(f); } +int sregexp(const char *str, char *pattern) +{ + int result; + regex_t patternc; + if(regcomp(&patternc, pattern, 0)!=0) + return 1; + result = regexec(&patternc, str, 0, NULL, 0); + regfree(&patternc); + return result; +} + void load_presets(void) { FILE *f=fopen("powder.def", "rb");