X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_main.h;fp=src%2Fgame_mm%2Fmm_main.h;h=cf99e635d1e6076fb58420daa52f1880a895661e;hp=fb0b029f470cb655576722de0b50bc581aea74d4;hb=2dbe35f19dc4c98e2f67a1b5d71cc848393576dc;hpb=0703af7954d64f643865647bfef8749cd01ab268

diff --git a/src/game_mm/mm_main.h b/src/game_mm/mm_main.h
index fb0b029f..cf99e635 100644
--- a/src/game_mm/mm_main.h
+++ b/src/game_mm/mm_main.h
@@ -296,29 +296,20 @@ extern int		num_element_info;
 #define EL_KETTLE		29
 #define EL_BOMB			30
 #define EL_PRISM		31
-#define EL_WALL_START		32
-#define EL_WALL_EMPTY		EL_WALL_START
-#define EL_WALL_00		EL_WALL_START
-#define EL_WALL_STEEL		EL_WALL_00
-#define EL_WALL_STEEL_START	EL_WALL_00
-#define EL_WALL_15		47
-#define EL_WALL_STEEL_END	EL_WALL_15
-#define EL_WALL_16		48
-#define EL_WALL_WOOD		EL_WALL_16
-#define EL_WALL_WOOD_START	EL_WALL_16
-#define EL_WALL_31		63
-#define EL_WALL_WOOD_END	EL_WALL_31
-#define EL_WALL_32		64
-#define EL_WALL_ICE		EL_WALL_32
-#define EL_WALL_ICE_START	EL_WALL_32
-#define EL_WALL_47		79
-#define EL_WALL_ICE_END		EL_WALL_47
-#define EL_WALL_48		80
-#define EL_WALL_AMOEBA		EL_WALL_48
-#define EL_WALL_AMOEBA_START	EL_WALL_48
-#define EL_WALL_63		95
-#define EL_WALL_AMOEBA_END	EL_WALL_63
-#define EL_WALL_END		EL_WALL_63
+#define EL_WALL_START		EL_WALL_STEEL_START
+#define EL_WALL_STEEL_BASE	32
+#define EL_WALL_STEEL_START	(EL_WALL_STEEL_BASE + 0)
+#define EL_WALL_STEEL_END	(EL_WALL_STEEL_BASE + 15)
+#define EL_WALL_WOOD_BASE	48
+#define EL_WALL_WOOD_START	(EL_WALL_WOOD_BASE + 0)
+#define EL_WALL_WOOD_END	(EL_WALL_WOOD_BASE + 15)
+#define EL_WALL_ICE_BASE	64
+#define EL_WALL_ICE_START	(EL_WALL_ICE_BASE + 0)
+#define EL_WALL_ICE_END		(EL_WALL_ICE_BASE + 15)
+#define EL_WALL_AMOEBA_BASE	80
+#define EL_WALL_AMOEBA_START	(EL_WALL_AMOEBA_BASE + 0)
+#define EL_WALL_AMOEBA_END	(EL_WALL_AMOEBA_BASE + 15)
+#define EL_WALL_END		EL_WALL_AMOEBA_END
 #define EL_BLOCK_WOOD		96
 #define EL_GRAY_BALL		97
 #define EL_BEAMER_START		98
@@ -483,14 +474,15 @@ extern int		num_element_info;
 #define EL_GRID_STEEL_FIXED_07	(EL_GRID_STEEL_FIXED_START + 7)	// 157.5°
 #define EL_GRID_STEEL_FIXED_END	EL_GRID_STEEL_FIXED_07
 
-#define EL_DF_WALL_WOOD		272
-#define EL_DF_WALL_START	EL_DF_WALL_WOOD_START
-#define EL_DF_WALL_WOOD_START	(EL_DF_WALL_WOOD + 0)
-#define EL_DF_WALL_WOOD_END	(EL_DF_WALL_WOOD + 15)
+#define EL_DF_WALL_WOOD_BASE	272
+#define EL_DF_WALL_WOOD_START	(EL_DF_WALL_WOOD_BASE + 0)
+#define EL_DF_WALL_WOOD_END	(EL_DF_WALL_WOOD_BASE + 15)
+
+#define EL_DF_WALL_STEEL_BASE	288
+#define EL_DF_WALL_STEEL_START	(EL_DF_WALL_STEEL_BASE + 0)
+#define EL_DF_WALL_STEEL_END	(EL_DF_WALL_STEEL_BASE + 15)
 
-#define EL_DF_WALL_STEEL	288
-#define EL_DF_WALL_STEEL_START	(EL_DF_WALL_STEEL + 0)
-#define EL_DF_WALL_STEEL_END	(EL_DF_WALL_STEEL + 15)
+#define EL_DF_WALL_START	EL_DF_WALL_WOOD_START
 #define EL_DF_WALL_END		EL_DF_WALL_STEEL_END
 
 #define EL_DF_EMPTY		304
@@ -579,14 +571,14 @@ extern int		num_element_info;
 #define EL_MCDUFFIN		420
 #define EL_PACMAN		421
 #define EL_FUSE_OFF		422
-#define EL_STEEL_WALL		423
-#define EL_WOODEN_WALL		424
-#define EL_ICE_WALL		425
-#define EL_AMOEBA_WALL		426
+#define EL_WALL_STEEL		423
+#define EL_WALL_WOOD		424
+#define EL_WALL_ICE		425
+#define EL_WALL_AMOEBA		426
 #define EL_LASER		427
 #define EL_RECEIVER		428
-#define EL_DF_STEEL_WALL	429
-#define EL_DF_WOODEN_WALL	430
+#define EL_DF_WALL_STEEL	429
+#define EL_DF_WALL_WOOD		430
 
 #define EL_MM_END_2		430
 #define EL_MM_END		EL_MM_END_2
@@ -596,8 +588,8 @@ extern int		num_element_info;
 #define EL_EXIT_CLOSING		501
 #define EL_GRAY_BALL_ACTIVE	502
 #define EL_GRAY_BALL_OPENING	503
-#define EL_ICE_WALL_SHRINKING	504
-#define EL_AMOEBA_WALL_GROWING	505
+#define EL_WALL_ICE_SHRINKING	504
+#define EL_WALL_AMOEBA_GROWING	505
 #define EL_BOMB_ACTIVE		506
 #define EL_MINE_ACTIVE		507
 #define EL_ENVELOPE_1_OPENING	508
@@ -608,9 +600,9 @@ extern int		num_element_info;
 #define EL_ENVELOPE_OPENING_START	EL_ENVELOPE_1_OPENING
 #define EL_ENVELOPE_OPENING_END		EL_ENVELOPE_4_OPENING
 
-#define EL_WALL_CHANGING	512
-#define EL_WALL_CHANGING_START	(EL_WALL_CHANGING + 0)
-#define EL_WALL_CHANGING_END	(EL_WALL_CHANGING + 15)
+#define EL_WALL_CHANGING_BASE	512
+#define EL_WALL_CHANGING_START	(EL_WALL_CHANGING_BASE + 0)
+#define EL_WALL_CHANGING_END	(EL_WALL_CHANGING_BASE + 15)
 
 #define EL_FIRST_RUNTIME_EL	EL_EXIT_OPENING