X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=40b1f51f0375ffa6341cfeeecfe5f7d9885b4a2c;hb=fe8debb851202d51ce323b077dfdbe9ac7915d4e;hp=f2b1485e6065f49e90bb512f52b1db2dcf3c811f;hpb=69d36457168d7bc11e25523bb08b94c2a35d83d0;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index f2b1485e..40b1f51f 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -593,6 +593,10 @@ enum
   GADGET_ID_BD_BUTTERFLY_2_EXPLODES_TO,
   GADGET_ID_BD_STONEFLY_EXPLODES_TO,
   GADGET_ID_BD_DRAGONFLY_EXPLODES_TO,
+  GADGET_ID_BD_DIAMOND_BIRTH_TURNS_TO,
+  GADGET_ID_BD_BOMB_EXPLOSION_TURNS_TO,
+  GADGET_ID_BD_NITRO_EXPLOSION_TURNS_TO,
+  GADGET_ID_BD_EXPLOSION_TURNS_TO,
   GADGET_ID_START_ELEMENT,
   GADGET_ID_ARTWORK_ELEMENT,
   GADGET_ID_EXPLOSION_ELEMENT,
@@ -1252,6 +1256,10 @@ enum
   ED_DRAWING_ID_BD_BUTTERFLY_2_EXPLODES_TO,
   ED_DRAWING_ID_BD_STONEFLY_EXPLODES_TO,
   ED_DRAWING_ID_BD_DRAGONFLY_EXPLODES_TO,
+  ED_DRAWING_ID_BD_DIAMOND_BIRTH_TURNS_TO,
+  ED_DRAWING_ID_BD_BOMB_EXPLOSION_TURNS_TO,
+  ED_DRAWING_ID_BD_NITRO_EXPLOSION_TURNS_TO,
+  ED_DRAWING_ID_BD_EXPLOSION_TURNS_TO,
   ED_DRAWING_ID_START_ELEMENT,
   ED_DRAWING_ID_ARTWORK_ELEMENT,
   ED_DRAWING_ID_EXPLOSION_ELEMENT,
@@ -3951,11 +3959,11 @@ static struct
   },
   {
     ED_CHECKBUTTON_ID_BD_CREATURES_TURN_ON_HATCHING,
-    ED_ELEMENT_SETTINGS_XPOS(0),		ED_ELEMENT_SETTINGS_YPOS(1),
+    ED_ELEMENT_SETTINGS_XPOS(0),		ED_ELEMENT_SETTINGS_YPOS(2),
     GADGET_ID_BD_CREATURES_TURN_ON_HATCHING,	GADGET_ID_NONE,
     &level.bd_creatures_turn_on_hatching,
     NULL, NULL,
-    "Creatures turn on hatching",		"Creatures change direction on hatching"
+    "Creatures auto turn on hatching",		"Creatures change direction on hatching"
   },
   {
     ED_CHECKBUTTON_ID_BD_GRAVITY_SWITCH_ACTIVE,
@@ -4751,6 +4759,38 @@ static struct
     &level.bd_dragonfly_explodes_to,		1, 1,
     "Explodes to:", NULL, NULL, NULL,		"Changes to this when exploding"
   },
+  {
+    ED_DRAWING_ID_BD_DIAMOND_BIRTH_TURNS_TO,
+    ED_AREA_1X1_SETTINGS_XPOS(0),		ED_AREA_1X1_SETTINGS_YPOS(1),
+    ED_AREA_1X1_SETTINGS_XOFF,			ED_AREA_1X1_SETTINGS_YOFF,
+    GADGET_ID_BD_DIAMOND_BIRTH_TURNS_TO,	GADGET_ID_NONE,
+    &level.bd_diamond_birth_turns_to,		1, 1,
+    "Explosion ends in:", NULL, NULL, NULL,	"Changes to this after explosion"
+  },
+  {
+    ED_DRAWING_ID_BD_BOMB_EXPLOSION_TURNS_TO,
+    ED_AREA_1X1_SETTINGS_XPOS(0),		ED_AREA_1X1_SETTINGS_YPOS(0),
+    ED_AREA_1X1_SETTINGS_XOFF,			ED_AREA_1X1_SETTINGS_YOFF,
+    GADGET_ID_BD_BOMB_EXPLOSION_TURNS_TO,	GADGET_ID_NONE,
+    &level.bd_bomb_explosion_turns_to,		1, 1,
+    "Explosion ends in:", NULL, NULL, NULL,	"Changes to this after explosion"
+  },
+  {
+    ED_DRAWING_ID_BD_NITRO_EXPLOSION_TURNS_TO,
+    ED_AREA_1X1_SETTINGS_XPOS(0),		ED_AREA_1X1_SETTINGS_YPOS(0),
+    ED_AREA_1X1_SETTINGS_XOFF,			ED_AREA_1X1_SETTINGS_YOFF,
+    GADGET_ID_BD_NITRO_EXPLOSION_TURNS_TO,	GADGET_ID_NONE,
+    &level.bd_nitro_explosion_turns_to,		1, 1,
+    "Explosion ends in:", NULL, NULL, NULL,	"Changes to this after explosion"
+  },
+  {
+    ED_DRAWING_ID_BD_EXPLOSION_TURNS_TO,
+    ED_AREA_1X1_SETTINGS_XPOS(0),		ED_AREA_1X1_SETTINGS_YPOS(1),
+    ED_AREA_1X1_SETTINGS_XOFF,			ED_AREA_1X1_SETTINGS_YOFF,
+    GADGET_ID_BD_EXPLOSION_TURNS_TO,		GADGET_ID_NONE,
+    &level.bd_explosion_turns_to,		1, 1,
+    "Explosion ends in:", NULL, NULL, NULL,	"Changes to this after explosion"
+  },
 
   // ---------- level start element -------------------------------------------
 
@@ -5089,9 +5129,9 @@ static int editor_el_boulderdash_native[] =
   EL_BD_ROCK,
   EL_BD_DIAMOND,
 
+  EL_BD_INBOX,
   EL_BD_STEELWALL,
   EL_BD_WALL,
-  EL_BD_SAND_2,
   EL_BD_MAGIC_WALL,
 
   EL_BD_AMOEBA,
@@ -5104,7 +5144,7 @@ static int editor_el_boulderdash_native[] =
   EL_BD_BUTTERFLY_RIGHT,
   EL_BD_FIREFLY_RIGHT,
 
-  EL_BD_INBOX,
+  EL_BD_SAND_2,
   EL_BD_BUTTERFLY_DOWN,
   EL_BD_FIREFLY_DOWN,
   EL_BD_EXIT_OPEN,
@@ -11693,6 +11733,8 @@ static boolean checkPropertiesConfig(int element)
       element == EL_BD_SAND ||
       element == EL_BD_ROCK ||
       element == EL_BD_MEGA_ROCK ||
+      element == EL_BD_BOMB ||
+      element == EL_BD_NITRO_PACK ||
       element == EL_BD_SWEET ||
       element == EL_BD_VOODOO_DOLL ||
       element == EL_BD_WATER ||
@@ -11828,7 +11870,7 @@ static void DrawPropertiesConfig(void)
 			       (properties_element == EL_BD_SLIME           ? 1 : 0) +
 			       (properties_element == EL_BD_ACID            ? 1 : 0) +
 			       (properties_element == EL_BD_REPLICATOR      ? 1 : 0) +
-			       (properties_element == EL_BD_CREATURE_SWITCH ? 2 : 0) +
+			       (properties_element == EL_BD_CREATURE_SWITCH ? 1 : 0) +
 			       (properties_element == EL_BD_GRAVITY_SWITCH  ? 2 : 0) +
 			       (properties_element == EL_EMC_MAGIC_BALL     ? 2 : 0) +
 			       num_element_counters);
@@ -11904,7 +11946,9 @@ static void DrawPropertiesConfig(void)
       MapDrawingArea(ED_DRAWING_ID_BD_AMOEBA_2_CONTENT_LOOKS_LIKE);
     }
     else if (IS_AMOEBOID(properties_element))
+    {
       MapDrawingArea(ED_DRAWING_ID_AMOEBA_CONTENT);
+    }
     else if (properties_element == EL_BD_ACID)
     {
       MapDrawingArea(ED_DRAWING_ID_BD_ACID_EATS_ELEMENT);
@@ -11923,7 +11967,9 @@ static void DrawPropertiesConfig(void)
 	     properties_element == EL_YAMYAM_RIGHT ||
 	     properties_element == EL_YAMYAM_UP ||
 	     properties_element == EL_YAMYAM_DOWN)
+    {
       DrawYamYamContentAreas();
+    }
     else if (properties_element == EL_EMC_MAGIC_BALL)
     {
       DrawMagicBallContentAreas();
@@ -11932,7 +11978,9 @@ static void DrawPropertiesConfig(void)
       MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INITIAL_BALL_ACTIVE);
     }
     else if (properties_element == EL_EMC_ANDROID)
+    {
       DrawAndroidElementArea();
+    }
     else if (properties_element == EL_MM_GRAY_BALL)
     {
       MapCounterButtons(ED_COUNTER_ID_MM_BALL_CONTENT);
@@ -12067,17 +12115,42 @@ static void DrawPropertiesConfig(void)
   if (level.game_engine_type == GAME_ENGINE_TYPE_BD)
   {
     if (IS_BD_FIREFLY(properties_element))
+    {
       MapDrawingArea(ED_DRAWING_ID_BD_FIREFLY_EXPLODES_TO);
+      MapDrawingArea(ED_DRAWING_ID_BD_EXPLOSION_TURNS_TO);
+    }
     else if (IS_BD_FIREFLY_2(properties_element))
+    {
       MapDrawingArea(ED_DRAWING_ID_BD_FIREFLY_2_EXPLODES_TO);
+      MapDrawingArea(ED_DRAWING_ID_BD_EXPLOSION_TURNS_TO);
+    }
     else if (IS_BD_BUTTERFLY(properties_element))
+    {
       MapDrawingArea(ED_DRAWING_ID_BD_BUTTERFLY_EXPLODES_TO);
+      MapDrawingArea(ED_DRAWING_ID_BD_DIAMOND_BIRTH_TURNS_TO);
+    }
     else if (IS_BD_BUTTERFLY_2(properties_element))
+    {
       MapDrawingArea(ED_DRAWING_ID_BD_BUTTERFLY_2_EXPLODES_TO);
+      MapDrawingArea(ED_DRAWING_ID_BD_DIAMOND_BIRTH_TURNS_TO);
+    }
     else if (IS_BD_STONEFLY(properties_element))
+    {
       MapDrawingArea(ED_DRAWING_ID_BD_STONEFLY_EXPLODES_TO);
+    }
     else if (IS_BD_DRAGONFLY(properties_element))
+    {
       MapDrawingArea(ED_DRAWING_ID_BD_DRAGONFLY_EXPLODES_TO);
+      MapDrawingArea(ED_DRAWING_ID_BD_EXPLOSION_TURNS_TO);
+    }
+    else if (properties_element == EL_BD_BOMB)
+    {
+      MapDrawingArea(ED_DRAWING_ID_BD_BOMB_EXPLOSION_TURNS_TO);
+    }
+    else if (properties_element == EL_BD_NITRO_PACK)
+    {
+      MapDrawingArea(ED_DRAWING_ID_BD_NITRO_EXPLOSION_TURNS_TO);
+    }
   }
 
   if (properties_element == EL_BD_MEGA_ROCK ||