diff options
| author | Simon <simon@hardwired.org.uk> | 2011-03-22 17:58:52 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-03-22 17:58:52 (GMT) |
| commit | 2e401babb793238564ca640fc802a52ab7f6c293 (patch) | |
| tree | 87a9b471e82604e76f96d556f5771322fb31818a /includes/defines.h | |
| parent | c096b2b14a200a0cc0a08cfea839c9e7f4edf22e (diff) | |
| parent | 04a9cbcb8855e64db660a8c6e23d79114b4afd83 (diff) | |
| download | powder-2e401babb793238564ca640fc802a52ab7f6c293.zip powder-2e401babb793238564ca640fc802a52ab7f6c293.tar.gz | |
Python console
Diffstat (limited to 'includes/defines.h')
| -rw-r--r-- | includes/defines.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/includes/defines.h b/includes/defines.h index 9ec6905..1af4d33 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -7,8 +7,8 @@ #define PATH_SEP "/" #endif -#define SAVE_VERSION 46 -#define MINOR_VERSION 4 +#define SAVE_VERSION 47 +#define MINOR_VERSION 0 #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter. #define BETA @@ -68,6 +68,9 @@ extern unsigned char ZSIZE; #define BRUSH_NUM 2 #define PYCONSOLE +//#define PYEXT +//WARNING pyext must be defined on 64bit! +//also, don't add a comment on that line, it breaks #ifdef PIX16 typedef unsigned short pixel; @@ -158,6 +161,8 @@ int player2spawn; int death2; int ISSPAWN1; int ISSPAWN2; +extern char pyready; +extern char pygood; extern sign signs[MAXSIGNS]; extern stamp stamps[STAMP_MAX]; extern int stamp_count; @@ -183,5 +188,5 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char void clear_sim(void); void del_stamp(int d); void sdl_seticon(void); -int process_command(pixel *vid_buf, char *console, char *console_error); +//int process_command(pixel *vid_buf, char *console, char *console_error, PyObject *pfunc); #endif |