summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2010-12-14 22:23:27 (GMT)
committer Cracker64 <cracker642@gmail.com>2010-12-14 22:23:27 (GMT)
commit5b2c6893941cc04bbe80f74b8ea35a744b0164cc (patch)
treeb18eeb273faf4ad6329e4183c1e16381b304f53b /includes
parent23f828135a21831adeb5511eb59b6dd2105baf27 (diff)
downloadpowder-5b2c6893941cc04bbe80f74b8ea35a744b0164cc.zip
powder-5b2c6893941cc04bbe80f74b8ea35a744b0164cc.tar.gz
another swch fix, desl fire fix, shift-g will make grid go down, BIZR glows from velocity in FIRE,ect. METL/BRMT/BMTL change color when heated in heat gradient view. other small changes.
Diffstat (limited to 'includes')
-rw-r--r--includes/defines.h2
-rw-r--r--includes/powder.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/defines.h b/includes/defines.h
index 2f73d02..e876c40 100644
--- a/includes/defines.h
+++ b/includes/defines.h
@@ -8,7 +8,7 @@
#endif
#define SAVE_VERSION 44
-#define MINOR_VERSION 6
+#define MINOR_VERSION 7
#define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter.
//#define BETA
diff --git a/includes/powder.h b/includes/powder.h
index 681b8f0..c061a14 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -137,7 +137,7 @@
#define PT_34 87
#define PT_LLIF 88
#define PT_STAN 89
-#define PT_CRAC 90
+#define PT_SPNG 90
#define PT_RIME 91
#define PT_FOG 92
#define PT_BCLN 93
@@ -490,7 +490,7 @@ static part_state pstates[PT_NUM] =
/* GOL */ {ST_NONE, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
/* GOL */ {ST_NONE, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
/* GOL */ {ST_NONE, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
- /* Crac */ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_FIRE, 2730.0f},
+ /* SPNG */ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_FIRE, 2730.0f},
/* RIME */ {ST_SOLID, PT_NONE, 0.0f, PT_WATR, 273.15f, PT_NONE, 0.0f, PT_NONE, 0.0f},
/* FOG */ {ST_GAS, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
/* BCLN */ {ST_NONE, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},