diff options
| author | Simon <simon@hardwired.org.uk> | 2011-02-04 10:24:35 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-02-04 10:24:35 (GMT) |
| commit | 9469a3b46a80970fc1d2a11df8c8692de90b6c00 (patch) | |
| tree | ac8069712226ab150076c3af32cd2b1ab3a71d7b /includes/defines.h | |
| parent | 525a59e28011cf26993c8e3f040a36ba7b7bf5e2 (diff) | |
| parent | 9064cabf288be8ecb2fbc1c15bb4071cf3df1c22 (diff) | |
| download | powder-9469a3b46a80970fc1d2a11df8c8692de90b6c00.zip powder-9469a3b46a80970fc1d2a11df8c8692de90b6c00.tar.gz | |
Merge with cracker, also fix version
Diffstat (limited to 'includes/defines.h')
| -rw-r--r-- | includes/defines.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/includes/defines.h b/includes/defines.h index b3b604f..967e3f1 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -8,14 +8,12 @@ #endif #define SAVE_VERSION 46 -#define MINOR_VERSION 0 +#define MINOR_VERSION 1 #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" -#undef PLOSS - #define THUMB_CACHE_SIZE 256 #define IMGCONNS 3 @@ -45,11 +43,11 @@ extern unsigned char ZSIZE; #define ISTP (CELL/2) #define CFDS (4.0f/CELL) -#define TSTEPP 0.3f -#define TSTEPV 0.4f -#define VADV 0.3f -#define VLOSS 0.999f -#define PLOSS 0.9999f +#define AIR_TSTEPP 0.3f +#define AIR_TSTEPV 0.4f +#define AIR_VADV 0.3f +#define AIR_VLOSS 0.999f +#define AIR_PLOSS 0.9999f #define GRID_X 5 #define GRID_Y 4 |