summaryrefslogtreecommitdiff
path: root/powder.h
diff options
context:
space:
mode:
authorAlex <zc00gii@gmail.com>2010-08-26 18:09:38 (GMT)
committer Alex <zc00gii@gmail.com>2010-08-26 18:09:38 (GMT)
commit0d25cae647b2d0827c366165257c5e812a8d8ddb (patch)
tree494e22a8b22a484a336e058e980378f9906e8a4d /powder.h
parentbb88587d9dd932c9f67add15f2ca7c83b02a5371 (diff)
downloadpowder-0d25cae647b2d0827c366165257c5e812a8d8ddb.zip
powder-0d25cae647b2d0827c366165257c5e812a8d8ddb.tar.gz
changed some defines to make more sense
Diffstat (limited to 'powder.h')
-rw-r--r--powder.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/powder.h b/powder.h
index 9757d5a..fa75435 100644
--- a/powder.h
+++ b/powder.h
@@ -41,16 +41,16 @@
#define PT_NONE 0
#define PT_DUST 1
#define PT_WATR 2
-#define PT_OILL 3
+#define PT_OIL 3
#define PT_FIRE 4
#define PT_STNE 5
#define PT_LAVA 6
#define PT_GUNP 7
#define PT_NITR 8
#define PT_CLNE 9
-#define PT_GASS 10
+#define PT_GAS 10
#define PT_PLEX 11
-#define PT_DFRM 12
+#define PT_GOO 12
#define PT_ICEI 13
#define PT_METL 14
#define PT_SPRK 15
@@ -306,7 +306,7 @@ static part_state pstates[PT_NUM] =
/* STKM */ {ST_NONE, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
/* SWCH */ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
/* SMKE */ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
- /* PLAS */ {ST_SOLID, PT_NONE, 0.0f, PT_OILL, 250.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
+ /* PLAS */ {ST_SOLID, PT_NONE, 0.0f, PT_OIL, 250.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
/* DESL */ {ST_LIQUID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_FIRE, 62.0f},
/* COAL */ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_FIRE, 600.0f},
/* LO2 */ {ST_LIQUID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_O2, -180.0f, PT_NONE, 0.0f},