diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-25 10:31:21 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-25 10:31:21 (GMT) |
| commit | 07a1f21df484a252d54c82262ade6d4117425694 (patch) | |
| tree | 80df86661553807159f7fda3fbf2506d5df3b5fa /includes/defines.h | |
| parent | f01056ee0249ad01ed24824aea39f05083110cd6 (diff) | |
| parent | f8d54e66dba5d8448d30f61f84883b4e7e6e1087 (diff) | |
| download | powder-07a1f21df484a252d54c82262ade6d4117425694.zip powder-07a1f21df484a252d54c82262ade6d4117425694.tar.gz | |
Merge latest with graphicstest
Diffstat (limited to 'includes/defines.h')
| -rw-r--r-- | includes/defines.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/includes/defines.h b/includes/defines.h index 62e0c48..e33bc0c 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -8,14 +8,16 @@ #endif //VersionInfoStart -#define SAVE_VERSION 64 -#define MINOR_VERSION 0 -//#define BETA -#define BUILD_NUM 0 +#define SAVE_VERSION 65 +#define MINOR_VERSION 5 +#define BUILD_NUM 100 //VersionInfoEnd #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter. +#define MTOS_EXPAND(str) #str +#define MTOS(str) MTOS_EXPAND(str) + #define SERVER "powdertoy.co.uk" #define SCRIPTSERVER "powdertoy.co.uk" @@ -164,8 +166,18 @@ extern int aheat_enable; extern int decorations_enable; extern int hud_enable; extern int pretty_powder; +extern int drawgrav_enable; int limitFPS; int water_equal_test; +extern int quickoptions_tooltip_fade; + +extern int debug_flags; +#define DEBUG_PERF_FRAMECOUNT 256 +extern int debug_perf_istart; +extern int debug_perf_iend; +extern long debug_perf_frametime[DEBUG_PERF_FRAMECOUNT]; +extern long debug_perf_partitime[DEBUG_PERF_FRAMECOUNT]; +extern long debug_perf_time; extern int debug_flags; #define DEBUG_PERF_FRAMECOUNT 256 |