Redo Wall IDs

1 files changed, 38 insertions, 21 deletions

diff --git a/src/simulation/SimulationData.h b/src/simulation/SimulationData.h
index 0624322..5e48e94 100644
--- a/src/simulation/SimulationData.h
+++ b/src/simulation/SimulationData.h
@@ -27,23 +27,44 @@
 
 #define UI_WALLSTART 222
 #define UI_ACTUALSTART 122
-#define UI_WALLCOUNT 25
-
-#define WL_WALLELEC	122
-#define WL_EWALL	123
-#define WL_DETECT	124
-#define WL_STREAM	125
-#define WL_SIGN	126
-#define WL_FAN	127
-#define WL_FANHELPER 255
-#define WL_ALLOWLIQUID	128
-#define WL_DESTROYALL	129
-#define WL_ERASE	130
-#define WL_WALL	131
-#define WL_ALLOWAIR	132
-#define WL_ALLOWSOLID	133
-#define WL_ALLOWALLELEC	134
-#define WL_EHOLE	135
+#define UI_WALLCOUNT 16
+
+#define O_WL_WALLELEC	122
+#define O_WL_EWALL		123
+#define O_WL_DETECT		124
+#define O_WL_STREAM		125
+#define O_WL_SIGN		126
+#define O_WL_FAN		127
+#define O_WL_FANHELPER	255
+#define O_WL_ALLOWLIQUID	128
+#define O_WL_DESTROYALL	129
+#define O_WL_ERASE		130
+#define O_WL_WALL		131
+#define O_WL_ALLOWAIR	132
+#define O_WL_ALLOWSOLID	133
+#define O_WL_ALLOWALLELEC	134
+#define O_WL_EHOLE		135
+#define O_WL_ALLOWGAS	140
+#define O_WL_GRAV		142
+#define O_WL_ALLOWENERGY 145
+
+
+#define WL_ERASE		0
+#define WL_WALLELEC		1
+#define WL_EWALL		2
+#define WL_DETECT		3
+#define WL_STREAM		4
+#define WL_FAN			5
+#define WL_ALLOWLIQUID	6
+#define WL_DESTROYALL	7
+#define WL_WALL			8
+#define WL_ALLOWAIR		9
+#define WL_ALLOWSOLID	10
+#define WL_ALLOWALLELEC	11
+#define WL_EHOLE		12
+#define WL_ALLOWGAS		13
+#define WL_GRAV			14
+#define WL_ALLOWENERGY	15
 
 #define SPC_AIR 236
 #define SPC_HEAT 237
@@ -54,10 +75,6 @@
 #define SPC_NGRV 244
 #define SPC_PROP 246
 
-#define WL_ALLOWGAS	140
-#define WL_GRAV		142
-#define WL_ALLOWENERGY 145
-
 #define DECO_DRAW	0
 #define DECO_ADD	1
 #define DECO_SUBTRACT	2