summaryrefslogtreecommitdiff
path: root/includes/defines.h
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-02-04 06:00:03 (GMT)
committer Cracker64 <cracker642@gmail.com>2011-02-04 06:00:03 (GMT)
commit9064cabf288be8ecb2fbc1c15bb4071cf3df1c22 (patch)
treee19413ebf90d2958069b4d108e61983fbe3638c3 /includes/defines.h
parentb6f1ba977cd1b33cf857816ede4dca883a989561 (diff)
downloadpowder-9064cabf288be8ecb2fbc1c15bb4071cf3df1c22.zip
powder-9064cabf288be8ecb2fbc1c15bb4071cf3df1c22.tar.gz
merge jacksonmj's and much better string parsing because of a function i found.
Diffstat (limited to 'includes/defines.h')
-rw-r--r--includes/defines.h12
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