diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-02-01 16:03:09 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-02-01 16:06:48 (GMT) |
| commit | 77bcac1a5628aecdf8e4c1968106e3bed86890ab (patch) | |
| tree | 6e55d756941374d89a1c87cf8193dfdf7a312629 /includes | |
| parent | c78d4203eecb9cd90cf6dafc5aa61e6aa0adf09d (diff) | |
| download | powder-77bcac1a5628aecdf8e4c1968106e3bed86890ab.zip powder-77bcac1a5628aecdf8e4c1968106e3bed86890ab.tar.gz | |
Small fixes
Fix nearest_part distance calculation
Rename air constants to avoid PLOSS clash with math.h
Prevent crashes due to bad lava ctype.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/defines.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/includes/defines.h b/includes/defines.h index b3b604f..9fba0fb 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -14,8 +14,6 @@ #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 |