X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=238a0774785a98193e2b52d6cc808e4df636bb2a;hb=bdcea486abce7687d85e130b713a470cc70715ef;hp=a943547a875a67819374a679b030e06ac8c38cd3;hpb=7bedd910f0f469c78d51a0c90f679258d5b0ced7;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index a943547a..238a0774 100644
--- a/src/main.h
+++ b/src/main.h
@@ -727,6 +727,9 @@
 #define IS_ENVELOPE(e)		((e) >= EL_ENVELOPE_1 &&		\
 	 			 (e) <= EL_ENVELOPE_4)
 
+#define IS_MM_ENVELOPE(e)	((e) >= EL_MM_ENVELOPE_1 &&		\
+				 (e) <= EL_MM_ENVELOPE_4)
+
 #define IS_BALLOON_ELEMENT(e)	((e) == EL_BALLOON ||			\
 				 (e) == EL_BALLOON_SWITCH_LEFT ||	\
 				 (e) == EL_BALLOON_SWITCH_RIGHT ||	\
@@ -802,6 +805,11 @@
 				 IS_EM_GATE_GRAY(e) ?  EM_GATE_GRAY_NR(e) :   \
 				 IS_EMC_GATE_GRAY(e) ? EMC_GATE_GRAY_NR(e) : 0)
 
+#define RND_ENVELOPE_NR(e)	((e) - EL_ENVELOPE_1)
+#define MM_ENVELOPE_NR(e)	((e) - EL_MM_ENVELOPE_1)
+#define ENVELOPE_NR(e)		(IS_ENVELOPE(e) ? RND_ENVELOPE_NR(e) :	\
+				 MM_ENVELOPE_NR(e))
+
 #define IS_ACID_POOL_OR_ACID(e)	(IS_ACID_POOL(e) || (e) == EL_ACID)
 
 #define IS_EMC_PILLAR(e)	((e) >= EL_EMC_WALL_1 &&		\
@@ -1702,11 +1710,10 @@
 #define EL_MM_WOODEN_GRID_FIXED_4	(EL_MM_WOODEN_GRID_FIXED_START + 3)
 #define EL_MM_WOODEN_GRID_FIXED_END	EL_MM_WOODEN_GRID_FIXED_03
 #define EL_MM_FUEL_EMPTY		(EL_MM_START + 155)
-
-#define EL_MM_UNUSED_156		(EL_MM_START + 156)
-#define EL_MM_UNUSED_157		(EL_MM_START + 157)
-#define EL_MM_UNUSED_158		(EL_MM_START + 158)
-#define EL_MM_UNUSED_159		(EL_MM_START + 159)
+#define EL_MM_ENVELOPE_1		(EL_MM_START + 156)
+#define EL_MM_ENVELOPE_2		(EL_MM_START + 157)
+#define EL_MM_ENVELOPE_3		(EL_MM_START + 158)
+#define EL_MM_ENVELOPE_4		(EL_MM_START + 159)
 
 #define EL_MM_END_1			(EL_MM_START + 159)
 #define EL_MM_START_2			(EL_MM_START + 160)
@@ -3755,7 +3762,6 @@ struct HelpAnimInfo
 
 
 extern Bitmap		       *bitmap_db_field;
-extern Bitmap		       *bitmap_db_panel;
 extern Bitmap		       *bitmap_db_door_1;
 extern Bitmap		       *bitmap_db_door_2;
 extern Bitmap		       *bitmap_db_store_1;