summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-01-18 00:11:30 (GMT)
committer Cracker64 <cracker642@gmail.com>2011-01-18 00:11:30 (GMT)
commite1eeaf9e9a1cd5f500cc262e871d36a341782eca (patch)
tree5f1fe3073265bc67fc7477252cac0ad80ca8aba7 /includes
parent926450a9a3db03d0abd1afcff4ea0269415c0ced (diff)
downloadpowder-e1eeaf9e9a1cd5f500cc262e871d36a341782eca.zip
powder-e1eeaf9e9a1cd5f500cc262e871d36a341782eca.tar.gz
test with increased element limit, there seems to be no performace decrease to me anyway. element limit of 4096
Diffstat (limited to 'includes')
-rw-r--r--includes/powder.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/powder.h b/includes/powder.h
index cc5980c..baa7f67 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -195,7 +195,7 @@
#define PT_TEST3 144
#define PT_FROG 145
#define PT_BRAN 146
-#define PT_NUM 147
+#define PT_NUM 147 //note for future elements, please SKIP numbers 222-240 and 255, these are walls. Element limit is now 4096 (experimental)
#define R_TEMP 22
#define MAX_TEMP 9999
@@ -437,7 +437,7 @@ static const part_type ptypes[PT_NUM] =
{"STAR", PIXPACK(0x0000FF), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE2, 9000.0f, 40, "Like Star Wars rule S3456/B278/6", TYPE_SOLID|PROP_LIFE, NULL},
{"FROG", PIXPACK(0x00AA00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE2, 9000.0f, 40, "Frogs S12/B34/3", TYPE_SOLID|PROP_LIFE, NULL},
{"BRAN", PIXPACK(0xCCCC00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE2, 9000.0f, 40, "Brian 6 S6/B246/3", TYPE_SOLID|PROP_LIFE, NULL},
-//Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins Description
+ //Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins Description
};
static part_state pstates[PT_NUM] =