summaryrefslogtreecommitdiff
path: root/src/simulation/SimulationData.h
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-16 21:01:33 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-16 21:01:33 (GMT)
commit6f8e2c03456552bdd54355606b8b8389f884c06d (patch)
treedc51900a69809f0230239dcee562d2758d6e550f /src/simulation/SimulationData.h
parent751da54183acb5f7dae94e815aec1e0daf7bbd36 (diff)
downloadpowder-6f8e2c03456552bdd54355606b8b8389f884c06d.zip
powder-6f8e2c03456552bdd54355606b8b8389f884c06d.tar.gz
remove unneeded / duplicate constants, fix SPC_AIR/other tools so it won't conflict with lua elements (the 11th one won't work right now)
Diffstat (limited to 'src/simulation/SimulationData.h')
-rw-r--r--src/simulation/SimulationData.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/simulation/SimulationData.h b/src/simulation/SimulationData.h
index 770d732..219db51 100644
--- a/src/simulation/SimulationData.h
+++ b/src/simulation/SimulationData.h
@@ -19,8 +19,6 @@
#define SC_CRACKER2 16
#define SC_TOTAL 15
-#define UI_WALLSTART 222
-#define UI_ACTUALSTART 122
#define UI_WALLCOUNT 16
#define O_WL_WALLELEC 122
@@ -61,14 +59,8 @@
#define WL_ALLOWENERGY 15
#define WL_FLOODHELPER 255
-#define SPC_AIR 236
-#define SPC_HEAT 237
-#define SPC_COOL 238
-#define SPC_VACUUM 239
-#define SPC_WIND 241
-#define SPC_PGRV 243
-#define SPC_NGRV 244
-#define SPC_PROP 246
+#define OLD_SPC_AIR 236
+#define SPC_AIR 256
#define DECO_DRAW 0
#define DECO_ADD 1