diff options
Diffstat (limited to 'includes/defines.h')
| -rw-r--r-- | includes/defines.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/includes/defines.h b/includes/defines.h index 8fb8fc8..1af4d33 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -7,15 +7,17 @@ #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 +#define BETA #define SERVER "powdertoy.co.uk" #define THUMB_CACHE_SIZE 256 +//#define pyconsole + #define IMGCONNS 3 #define TIMEOUT 100 #define HTTP_TIMEOUT 10 @@ -65,6 +67,11 @@ extern unsigned char ZSIZE; #define SQUARE_BRUSH 1 #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; #else @@ -154,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; @@ -179,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 |