X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffiles.c;h=a0c0564cb99a1e2215169e8ec59b2a23186a8c00;hb=8016176ff827829c33231df9a8902e543b7131f3;hp=4967317e9c1eb2778da3644d6ab35c2a910b8a27;hpb=354869079f826d51494014b916011fc49ffd579d;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 4967317e..a0c0564c 100644
--- a/src/files.c
+++ b/src/files.c
@@ -667,6 +667,66 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
     &li.bd_diamond_turns_to_on_impact,	EL_BD_DIAMOND
   },
 
+  {
+    EL_BD_FIREFLY,			-1,
+    TYPE_ELEMENT,			CONF_VALUE_16_BIT(1),
+    &li.bd_firefly_explodes_to,		EL_BD_EXPLODING_1
+  },
+
+  {
+    EL_BD_FIREFLY_2,			-1,
+    TYPE_ELEMENT,			CONF_VALUE_16_BIT(1),
+    &li.bd_firefly_2_explodes_to,	EL_BD_EXPLODING_1
+  },
+
+  {
+    EL_BD_BUTTERFLY,			-1,
+    TYPE_ELEMENT,			CONF_VALUE_16_BIT(1),
+    &li.bd_butterfly_explodes_to,	EL_BD_DIAMOND_GROWING_1
+  },
+
+  {
+    EL_BD_BUTTERFLY_2,			-1,
+    TYPE_ELEMENT,			CONF_VALUE_16_BIT(1),
+    &li.bd_butterfly_2_explodes_to,	EL_BD_DIAMOND_GROWING_1
+  },
+
+  {
+    EL_BD_STONEFLY,			-1,
+    TYPE_ELEMENT,			CONF_VALUE_16_BIT(1),
+    &li.bd_stonefly_explodes_to,	EL_BD_ROCK_GROWING_1
+  },
+
+  {
+    EL_BD_DRAGONFLY,			-1,
+    TYPE_ELEMENT,			CONF_VALUE_16_BIT(1),
+    &li.bd_dragonfly_explodes_to,	EL_BD_EXPLODING_1
+  },
+
+  {
+    EL_BD_DIAMOND_GROWING_5,		-1,
+    TYPE_ELEMENT,			CONF_VALUE_16_BIT(1),
+    &li.bd_diamond_birth_turns_to,	EL_BD_DIAMOND
+  },
+
+  {
+    EL_BD_BOMB_EXPLODING_4,		-1,
+    TYPE_ELEMENT,			CONF_VALUE_16_BIT(1),
+    &li.bd_bomb_explosion_turns_to,	EL_BD_WALL
+  },
+
+  {
+    EL_BD_NITRO_PACK_EXPLODING_4,	-1,
+    TYPE_ELEMENT,			CONF_VALUE_16_BIT(1),
+    &li.bd_nitro_explosion_turns_to,	EL_EMPTY
+  },
+
+  {
+    EL_BD_EXPLODING_5,			-1,
+    TYPE_ELEMENT,			CONF_VALUE_16_BIT(1),
+    &li.bd_explosion_turns_to,		EL_EMPTY
+  },
+
   {
     EL_BD_MAGIC_WALL,			-1,
     TYPE_BOOLEAN,			CONF_VALUE_8_BIT(1),
@@ -4286,6 +4346,18 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level)
   cave->diamond_falling_effect		= LEVEL_TO_CAVE(level->bd_diamond_turns_to_on_falling);
   cave->diamond_bouncing_effect		= LEVEL_TO_CAVE(level->bd_diamond_turns_to_on_impact);
 
+  cave->firefly_explode_to		= LEVEL_TO_CAVE(level->bd_firefly_explodes_to);
+  cave->alt_firefly_explode_to		= LEVEL_TO_CAVE(level->bd_firefly_2_explodes_to);
+  cave->butterfly_explode_to		= LEVEL_TO_CAVE(level->bd_butterfly_explodes_to);
+  cave->alt_butterfly_explode_to	= LEVEL_TO_CAVE(level->bd_butterfly_2_explodes_to);
+  cave->stonefly_explode_to		= LEVEL_TO_CAVE(level->bd_stonefly_explodes_to);
+  cave->dragonfly_explode_to		= LEVEL_TO_CAVE(level->bd_dragonfly_explodes_to);
+
+  cave->diamond_birth_effect		= LEVEL_TO_CAVE(level->bd_diamond_birth_turns_to);
+  cave->bomb_explosion_effect		= LEVEL_TO_CAVE(level->bd_bomb_explosion_turns_to);
+  cave->nitro_explosion_effect		= LEVEL_TO_CAVE(level->bd_nitro_explosion_turns_to);
+  cave->explosion_effect		= LEVEL_TO_CAVE(level->bd_explosion_turns_to);
+
   // level name
   strncpy(cave->name, level->name, sizeof(GdString));
   cave->name[sizeof(GdString) - 1] = '\0';
@@ -4435,6 +4507,18 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level)
   level->bd_diamond_turns_to_on_falling	= CAVE_TO_LEVEL(cave->diamond_falling_effect);
   level->bd_diamond_turns_to_on_impact	= CAVE_TO_LEVEL(cave->diamond_bouncing_effect);
 
+  level->bd_firefly_explodes_to		= CAVE_TO_LEVEL(cave->firefly_explode_to);
+  level->bd_firefly_2_explodes_to	= CAVE_TO_LEVEL(cave->alt_firefly_explode_to);
+  level->bd_butterfly_explodes_to	= CAVE_TO_LEVEL(cave->butterfly_explode_to);
+  level->bd_butterfly_2_explodes_to	= CAVE_TO_LEVEL(cave->alt_butterfly_explode_to);
+  level->bd_stonefly_explodes_to	= CAVE_TO_LEVEL(cave->stonefly_explode_to);
+  level->bd_dragonfly_explodes_to	= CAVE_TO_LEVEL(cave->dragonfly_explode_to);
+
+  level->bd_diamond_birth_turns_to	= CAVE_TO_LEVEL(cave->diamond_birth_effect);
+  level->bd_bomb_explosion_turns_to	= CAVE_TO_LEVEL(cave->bomb_explosion_effect);
+  level->bd_nitro_explosion_turns_to	= CAVE_TO_LEVEL(cave->nitro_explosion_effect);
+  level->bd_explosion_turns_to		= CAVE_TO_LEVEL(cave->explosion_effect);
+
   // level name
   char *cave_name = getStringPrint("%s / %d", cave->name, bd_level_nr + 1);