From: Holger Schemel <info@artsoft.org>
Date: Fri, 17 Feb 2017 21:38:25 +0000 (+0100)
Subject: added more definitions for Mirror Magic (and Deflektor) game elements
X-Git-Tag: 4.1.0.0~226
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=b71346a299000d7005f8198fa63c89f3799dbc49;p=rocksndiamonds.git

added more definitions for Mirror Magic (and Deflektor) game elements
---

diff --git a/src/main.c b/src/main.c
index bdb16a30..6aab6fd6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6876,6 +6876,56 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "amoeba",
     "-"
   },
+  {
+    "mm_mask_mcduffin.right",
+    "-",
+    "-"
+  },
+  {
+    "mm_mask_mcduffin.up",
+    "-",
+    "-"
+  },
+  {
+    "mm_mask_mcduffin.left",
+    "-",
+    "-"
+  },
+  {
+    "mm_mask_mcduffin.down",
+    "-",
+    "-"
+  },
+  {
+    "mm_mask_grid_1",
+    "-",
+    "-"
+  },
+  {
+    "mm_mask_grid_2",
+    "-",
+    "-"
+  },
+  {
+    "mm_mask_grid_3",
+    "-",
+    "-"
+  },
+  {
+    "mm_mask_grid_4",
+    "-",
+    "-"
+  },
+  {
+    "mm_mask_rectangle",
+    "-",
+    "-"
+  },
+  {
+    "mm_mask_circle",
+    "-",
+    "-"
+  },
   {
     "[default]",
     "default",
@@ -6896,6 +6946,11 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "sb_default",
     "-"
   },
+  {
+    "[mm_default]",
+    "mm_default",
+    "-"
+  },
   {
     "graphic_1",
     "graphic",
diff --git a/src/main.h b/src/main.h
index badd8404..cf8cbe7f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1817,8 +1817,6 @@
 #define EL_MM_BEAMER_BLUE_16		(EL_MM_BEAMER_BLUE_START + 15)
 #define EL_MM_BEAMER_BLUE_END		EL_MM_BEAMER_BLUE_16
 
-#define EL_MM_END			(EL_DF_START2 + 419)
-
 #define EL_MM_MCDUFFIN			1200
 #define EL_MM_PACMAN			1201
 #define EL_MM_FUSE			1202
@@ -1831,6 +1829,8 @@
 #define EL_DF_STEEL_WALL		1209
 #define EL_DF_WOODEN_WALL		1210
 
+#define EL_MM_END			(EL_DF_START2 + 430)
+
 #define NUM_FILE_ELEMENTS		1211
 
 
@@ -1917,6 +1917,9 @@
 
 #define NUM_DRAWABLE_ELEMENTS		(EL_FIRST_RUNTIME_REAL + 77)
 
+#define EL_MM_RUNTIME_START		EL_MM_EXIT_OPENING
+#define EL_MM_RUNTIME_END		EL_MM_AMOEBA_WALL_GROWING
+
 /* "unreal" (and therefore not drawable) runtime elements */
 #define EL_FIRST_RUNTIME_UNREAL		(NUM_DRAWABLE_ELEMENTS)
 
@@ -1971,21 +1974,35 @@
 #define EL_SHIELD_NORMAL_ACTIVE		(EL_FIRST_DUMMY + 18)
 #define EL_SHIELD_DEADLY_ACTIVE		(EL_FIRST_DUMMY + 19)
 #define EL_AMOEBA			(EL_FIRST_DUMMY + 20)
-#define EL_DEFAULT			(EL_FIRST_DUMMY + 21)
-#define EL_BD_DEFAULT			(EL_FIRST_DUMMY + 22)
-#define EL_SP_DEFAULT			(EL_FIRST_DUMMY + 23)
-#define EL_SB_DEFAULT			(EL_FIRST_DUMMY + 24)
-#define EL_GRAPHIC_1			(EL_FIRST_DUMMY + 25)
-#define EL_GRAPHIC_2			(EL_FIRST_DUMMY + 26)
-#define EL_GRAPHIC_3			(EL_FIRST_DUMMY + 27)
-#define EL_GRAPHIC_4			(EL_FIRST_DUMMY + 28)
-#define EL_GRAPHIC_5			(EL_FIRST_DUMMY + 29)
-#define EL_GRAPHIC_6			(EL_FIRST_DUMMY + 30)
-#define EL_GRAPHIC_7			(EL_FIRST_DUMMY + 31)
-#define EL_GRAPHIC_8			(EL_FIRST_DUMMY + 32)
+#define EL_MM_MASK_MCDUFFIN_RIGHT	(EL_FIRST_DUMMY + 21)
+#define EL_MM_MASK_MCDUFFIN_UP		(EL_FIRST_DUMMY + 22)
+#define EL_MM_MASK_MCDUFFIN_LEFT	(EL_FIRST_DUMMY + 23)
+#define EL_MM_MASK_MCDUFFIN_DOWN	(EL_FIRST_DUMMY + 24)
+#define EL_MM_MASK_GRID_1		(EL_FIRST_DUMMY + 25)
+#define EL_MM_MASK_GRID_2		(EL_FIRST_DUMMY + 26)
+#define EL_MM_MASK_GRID_3		(EL_FIRST_DUMMY + 27)
+#define EL_MM_MASK_GRID_4		(EL_FIRST_DUMMY + 28)
+#define EL_MM_MASK_RECTANGLE		(EL_FIRST_DUMMY + 29)
+#define EL_MM_MASK_CIRCLE		(EL_FIRST_DUMMY + 30)
+#define EL_DEFAULT			(EL_FIRST_DUMMY + 31)
+#define EL_BD_DEFAULT			(EL_FIRST_DUMMY + 32)
+#define EL_SP_DEFAULT			(EL_FIRST_DUMMY + 33)
+#define EL_SB_DEFAULT			(EL_FIRST_DUMMY + 34)
+#define EL_MM_DEFAULT			(EL_FIRST_DUMMY + 35)
+#define EL_GRAPHIC_1			(EL_FIRST_DUMMY + 36)
+#define EL_GRAPHIC_2			(EL_FIRST_DUMMY + 37)
+#define EL_GRAPHIC_3			(EL_FIRST_DUMMY + 38)
+#define EL_GRAPHIC_4			(EL_FIRST_DUMMY + 39)
+#define EL_GRAPHIC_5			(EL_FIRST_DUMMY + 40)
+#define EL_GRAPHIC_6			(EL_FIRST_DUMMY + 41)
+#define EL_GRAPHIC_7			(EL_FIRST_DUMMY + 42)
+#define EL_GRAPHIC_8			(EL_FIRST_DUMMY + 43)
+
+#define EL_MM_DUMMY_START		EL_MM_MASK_MCDUFFIN_RIGHT
+#define EL_MM_DUMMY_END			EL_MM_MASK_CIRCLE
 
 /* internal elements (only used for internal purposes like copying) */
-#define EL_FIRST_INTERNAL		(EL_FIRST_DUMMY + 33)
+#define EL_FIRST_INTERNAL		(EL_FIRST_DUMMY + 44)
 
 #define EL_INTERNAL_CLIPBOARD_CUSTOM	(EL_FIRST_INTERNAL + 0)
 #define EL_INTERNAL_CLIPBOARD_CHANGE	(EL_FIRST_INTERNAL + 1)