merge merge merge

This commit is contained in:
Cracker64
2011-03-10 15:43:27 -05:00
parent ca1cd0da06
commit 3b048f8a06
14 changed files with 1740 additions and 907 deletions

View File

@@ -225,7 +225,7 @@ void open_link(char *uri);
int report_ui(pixel *vid_buf, char *save_id);
char *console_ui(pixel *vid_buf, char error[255]);
char *console_ui(pixel *vid_buf, char error[255],char console_more);
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);