summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-01-31 18:12:29 (GMT)
committer Cracker64 <cracker642@gmail.com>2011-01-31 18:12:29 (GMT)
commitc1ca8bae2980fba045fbd881a18a9e75c14361aa (patch)
tree417aa53f2b5272e3c50a32f53be149e48c53bb9a /includes
parent3babc0586c9b8a0de12962a2cc89c93ea3c7f02f (diff)
downloadpowder-c1ca8bae2980fba045fbd881a18a9e75c14361aa.zip
powder-c1ca8bae2980fba045fbd881a18a9e75c14361aa.tar.gz
merge jacksonmj's and simon's changes, and made mouse coords show up in debug so it is easier to get them.
Diffstat (limited to 'includes')
-rw-r--r--includes/interface.h5
-rw-r--r--includes/misc.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/includes/interface.h b/includes/interface.h
index 870e917..2cb64dd 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 7efb3f1..4094b39 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);