From: Holger Schemel <info@artsoft.org>
Date: Sat, 18 Feb 2017 11:31:57 +0000 (+0100)
Subject: added some more definitions for Mirror Magic element graphics
X-Git-Tag: 4.1.0.0~214
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=917c27f49f56f42bcc41627e6e284eb840f94103;p=rocksndiamonds.git

added some more definitions for Mirror Magic element graphics
---

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index c7c379e7..06ca3e06 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -4998,6 +4998,18 @@ struct ConfigInfo image_config[] =
   { "mm_lightball.frames",			"3"			},
   { "mm_lightball.delay",			"1000000"		},
   { "mm_lightball.anim_mode",			"random"		},
+  { "mm_lightball_red",				"RocksMM.png"		},
+  { "mm_lightball_red.xpos",			"12"			},
+  { "mm_lightball_red.ypos",			"2"			},
+  { "mm_lightball_red.frames",			"1"			},
+  { "mm_lightball_blue",			"RocksMM.png"		},
+  { "mm_lightball_blue.xpos",			"13"			},
+  { "mm_lightball_blue.ypos",			"2"			},
+  { "mm_lightball_blue.frames",			"1"			},
+  { "mm_lightball_yellow",			"RocksMM.png"		},
+  { "mm_lightball_yellow.xpos",			"14"			},
+  { "mm_lightball_yellow.ypos",			"2"			},
+  { "mm_lightball_yellow.frames",		"1"			},
 
   { "mm_gray_ball",				"RocksMM.png"		},
   { "mm_gray_ball.xpos",			"15"			},
diff --git a/src/main.c b/src/main.c
index 6aab6fd6..c2e2338d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6876,6 +6876,21 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "amoeba",
     "-"
   },
+  {
+    "mm_lightball_red",
+    "-",
+    "-"
+  },
+  {
+    "mm_lightball_blue",
+    "-",
+    "-"
+  },
+  {
+    "mm_lightball_yellow",
+    "-",
+    "-"
+  },
   {
     "mm_mask_mcduffin.right",
     "-",
diff --git a/src/main.h b/src/main.h
index cf8cbe7f..5a1b3f77 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1974,35 +1974,38 @@
 #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_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_LIGHTBALL_RED		(EL_FIRST_DUMMY + 21)
+#define EL_MM_LIGHTBALL_BLUE		(EL_FIRST_DUMMY + 22)
+#define EL_MM_LIGHTBALL_YELLOW		(EL_FIRST_DUMMY + 23)
+#define EL_MM_MASK_MCDUFFIN_RIGHT	(EL_FIRST_DUMMY + 24)
+#define EL_MM_MASK_MCDUFFIN_UP		(EL_FIRST_DUMMY + 25)
+#define EL_MM_MASK_MCDUFFIN_LEFT	(EL_FIRST_DUMMY + 26)
+#define EL_MM_MASK_MCDUFFIN_DOWN	(EL_FIRST_DUMMY + 27)
+#define EL_MM_MASK_GRID_1		(EL_FIRST_DUMMY + 28)
+#define EL_MM_MASK_GRID_2		(EL_FIRST_DUMMY + 29)
+#define EL_MM_MASK_GRID_3		(EL_FIRST_DUMMY + 30)
+#define EL_MM_MASK_GRID_4		(EL_FIRST_DUMMY + 31)
+#define EL_MM_MASK_RECTANGLE		(EL_FIRST_DUMMY + 32)
+#define EL_MM_MASK_CIRCLE		(EL_FIRST_DUMMY + 33)
+#define EL_DEFAULT			(EL_FIRST_DUMMY + 34)
+#define EL_BD_DEFAULT			(EL_FIRST_DUMMY + 35)
+#define EL_SP_DEFAULT			(EL_FIRST_DUMMY + 36)
+#define EL_SB_DEFAULT			(EL_FIRST_DUMMY + 37)
+#define EL_MM_DEFAULT			(EL_FIRST_DUMMY + 38)
+#define EL_GRAPHIC_1			(EL_FIRST_DUMMY + 39)
+#define EL_GRAPHIC_2			(EL_FIRST_DUMMY + 40)
+#define EL_GRAPHIC_3			(EL_FIRST_DUMMY + 41)
+#define EL_GRAPHIC_4			(EL_FIRST_DUMMY + 42)
+#define EL_GRAPHIC_5			(EL_FIRST_DUMMY + 43)
+#define EL_GRAPHIC_6			(EL_FIRST_DUMMY + 44)
+#define EL_GRAPHIC_7			(EL_FIRST_DUMMY + 45)
+#define EL_GRAPHIC_8			(EL_FIRST_DUMMY + 46)
 
 #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 + 44)
+#define EL_FIRST_INTERNAL		(EL_FIRST_DUMMY + 47)
 
 #define EL_INTERNAL_CLIPBOARD_CUSTOM	(EL_FIRST_INTERNAL + 0)
 #define EL_INTERNAL_CLIPBOARD_CHANGE	(EL_FIRST_INTERNAL + 1)