X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=28fda4e084bded0987e95063d08a0493bea107d6;hb=b640b9d7647df4cbba0e530f6f4bcece384048e4;hp=cc3b23d57273030597f55e17e1c56df70179b9cb;hpb=b180608242f0190c6c8b31772e4dcfce2e9af47c;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index cc3b23d5..28fda4e0 100644
--- a/src/init.c
+++ b/src/init.c
@@ -66,6 +66,11 @@ static int copy_properties[][5] =
     EL_PACMAN_LEFT,		EL_PACMAN_RIGHT,
     EL_PACMAN_UP,		EL_PACMAN_DOWN
   },
+  {
+    EL_YAMYAM,
+    EL_YAMYAM_LEFT,		EL_YAMYAM_RIGHT,
+    EL_YAMYAM_UP,		EL_YAMYAM_DOWN
+  },
   {
     EL_MOLE,
     EL_MOLE_LEFT,		EL_MOLE_RIGHT,
@@ -109,6 +114,14 @@ inline void InitElementSmallImagesScaledUp(int graphic)
 
 void InitElementSmallImages()
 {
+  static int special_graphics[] =
+  {
+    IMG_EDITOR_ELEMENT_BORDER,
+    IMG_EDITOR_ELEMENT_BORDER_INPUT,
+    IMG_EDITOR_CASCADE_LIST,
+    IMG_EDITOR_CASCADE_LIST_ACTIVE,
+    -1
+  };
   struct PropertyMapping *property_mapping = getImageListPropertyMapping();
   int num_property_mappings = getImageListPropertyMappingSize();
   int i;
@@ -124,6 +137,10 @@ void InitElementSmallImages()
   /* initialize images from dynamic configuration (may be elements or other) */
   for (i = 0; i < num_property_mappings; i++)
     InitElementSmallImagesScaledUp(property_mapping[i].artwork_index);
+
+  /* initialize special images from above list (non-element images) */
+  for (i = 0; special_graphics[i] > -1; i++)
+    InitElementSmallImagesScaledUp(special_graphics[i]);
 }
 
 #if 1
@@ -308,7 +325,7 @@ void InitElementGraphicInfo()
       element_info[i].graphic[act] = -1;
       element_info[i].crumbled[act] = -1;
 
-      for (dir = 0; dir < NUM_DIRECTIONS; dir++)
+      for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
       {
 	element_info[i].direction_graphic[act][dir] = -1;
 	element_info[i].direction_crumbled[act][dir] = -1;
@@ -392,7 +409,7 @@ void InitElementGraphicInfo()
     if (crumbled)
     {
       if (direction < 0)
-	for (dir = 0; dir < NUM_DIRECTIONS; dir++)
+	for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
 	  element_info[element].direction_crumbled[action][dir] = -1;
 
       if (direction > -1)
@@ -403,7 +420,7 @@ void InitElementGraphicInfo()
     else
     {
       if (direction < 0)
-	for (dir = 0; dir < NUM_DIRECTIONS; dir++)
+	for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
 	  element_info[element].direction_graphic[action][dir] = -1;
 
       if (direction > -1)
@@ -431,7 +448,7 @@ void InitElementGraphicInfo()
 	element_info[i].crumbled[act] =
 	  element_info[crumbled_like].crumbled[act];
       for (act = 0; act < NUM_ACTIONS; act++)
-	for (dir = 0; dir < NUM_DIRECTIONS; dir++)
+	for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
 	  element_info[i].direction_crumbled[act][dir] =
 	    element_info[crumbled_like].direction_crumbled[act][dir];
     }
@@ -440,7 +457,7 @@ void InitElementGraphicInfo()
     {
       element_info[i].graphic[ACTION_DIGGING] =
 	element_info[diggable_like].graphic[ACTION_DIGGING];
-      for (dir = 0; dir < NUM_DIRECTIONS; dir++)
+      for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
 	element_info[i].direction_graphic[ACTION_DIGGING][dir] =
 	  element_info[diggable_like].direction_graphic[ACTION_DIGGING][dir];
     }
@@ -451,6 +468,17 @@ void InitElementGraphicInfo()
   element_info[EL_AMOEBA_TO_DIAMOND].graphic[ACTION_DEFAULT] = IMG_AMOEBA_DEAD;
 #endif
 
+#if 1
+  /* set hardcoded definitions for some internal elements without graphic */
+  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
+  {
+    if (IS_EDITOR_CASCADE_INACTIVE(i))
+      element_info[i].graphic[ACTION_DEFAULT] = IMG_EDITOR_CASCADE_LIST;
+    else if (IS_EDITOR_CASCADE_ACTIVE(i))
+      element_info[i].graphic[ACTION_DEFAULT] = IMG_EDITOR_CASCADE_LIST_ACTIVE;
+  }
+#endif
+
   /* now set all undefined/invalid graphics to -1 to set to default after it */
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
@@ -466,7 +494,7 @@ void InitElementGraphicInfo()
       if (graphic > 0 && graphic_info[graphic].bitmap == NULL)
 	element_info[i].crumbled[act] = -1;
 
-      for (dir = 0; dir < NUM_DIRECTIONS; dir++)
+      for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
       {
 	graphic = element_info[i].direction_graphic[act][dir];
 	if (graphic > 0 && graphic_info[graphic].bitmap == NULL)
@@ -485,7 +513,7 @@ void InitElementGraphicInfo()
   {
     for (act = 0; act < NUM_ACTIONS; act++)
     {
-      for (dir = 0; dir < NUM_DIRECTIONS; dir++)
+      for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
       {
 	int graphic = element_info[i].direction_graphic[act][dir];
 	int move_dir = (act == ACTION_FALLING ? MV_BIT_DOWN : dir);
@@ -543,8 +571,8 @@ void InitElementGraphicInfo()
   {
     int default_graphic = element_info[i].graphic[ACTION_DEFAULT];
     int default_crumbled = element_info[i].crumbled[ACTION_DEFAULT];
-    int default_direction_graphic[NUM_DIRECTIONS];
-    int default_direction_crumbled[NUM_DIRECTIONS];
+    int default_direction_graphic[NUM_DIRECTIONS_FULL];
+    int default_direction_crumbled[NUM_DIRECTIONS_FULL];
 
     if (default_graphic == -1)
       default_graphic = IMG_UNKNOWN;
@@ -557,7 +585,7 @@ void InitElementGraphicInfo()
       default_crumbled = IMG_EMPTY;
 #endif
 
-    for (dir = 0; dir < NUM_DIRECTIONS; dir++)
+    for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
     {
       default_direction_graphic[dir] =
 	element_info[i].direction_graphic[ACTION_DEFAULT][dir];
@@ -630,7 +658,7 @@ void InitElementGraphicInfo()
 	default_action_crumbled = default_crumbled;
 #endif
 
-      for (dir = 0; dir < NUM_DIRECTIONS; dir++)
+      for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
       {
 	/* use action graphic as the default direction graphic, if undefined */
 	int default_action_direction_graphic = element_info[i].graphic[act];
@@ -689,6 +717,8 @@ void InitElementGraphicInfo()
     }
   }
 
+#if 0
+  /* !!! THIS ALSO CLEARS SPECIAL FLAGS (AND IS NOT NEEDED ANYWAY) !!! */
   /* set animation mode to "none" for each graphic with only 1 frame */
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
@@ -702,7 +732,7 @@ void InitElementGraphicInfo()
       if (graphic_info[crumbled].anim_frames == 1)
 	graphic_info[crumbled].anim_mode = ANIM_NONE;
 
-      for (dir = 0; dir < NUM_DIRECTIONS; dir++)
+      for (dir = 0; dir < NUM_DIRECTIONS_FULL; dir++)
       {
 	graphic = element_info[i].direction_graphic[act][dir];
 	crumbled = element_info[i].direction_crumbled[act][dir];
@@ -714,6 +744,7 @@ void InitElementGraphicInfo()
       }
     }
   }
+#endif
 
 #if 0
 #if DEBUG
@@ -1658,7 +1689,7 @@ static int get_special_property_bit(int element, int property_bit_nr)
     { EL_SP_MURPHY,		0	},
     { EL_SOKOBAN_FIELD_PLAYER,	0	},
 
-    /* all element that can move may be able to also move into acid */
+    /* all elements that can move may be able to also move into acid */
     { EL_BUG,			1	},
     { EL_BUG_LEFT,		1	},
     { EL_BUG_RIGHT,		1	},
@@ -1680,6 +1711,10 @@ static int get_special_property_bit(int element, int property_bit_nr)
     { EL_BD_FIREFLY_UP,		4	},
     { EL_BD_FIREFLY_DOWN,	4	},
     { EL_YAMYAM,		5	},
+    { EL_YAMYAM_LEFT,		5	},
+    { EL_YAMYAM_RIGHT,		5	},
+    { EL_YAMYAM_UP,		5	},
+    { EL_YAMYAM_DOWN,		5	},
     { EL_DARK_YAMYAM,		6	},
     { EL_ROBOT,			7	},
     { EL_PACMAN,		8	},
@@ -1700,6 +1735,7 @@ static int get_special_property_bit(int element, int property_bit_nr)
     { EL_SP_ELECTRON,		15	},
     { EL_BALLOON,		16	},
     { EL_SPRING,	        17	},
+    { EL_EMC_ANDROID,	        18	},
 
     { -1,			-1	},
   };
@@ -1765,6 +1801,55 @@ boolean getBitfieldProperty(int *bitfield, int property_bit_nr, int element)
   return FALSE;
 }
 
+#if 1
+static void resolve_group_element(int group_element, int recursion_depth)
+{
+  static int group_nr;
+  static struct ElementGroupInfo *group;
+  struct ElementGroupInfo *actual_group = element_info[group_element].group;
+  int i;
+
+  if (actual_group == NULL)			/* not yet initialized */
+    return;
+
+  if (recursion_depth > NUM_GROUP_ELEMENTS)	/* recursion too deep */
+  {
+    Error(ERR_WARN, "recursion too deep when resolving group element %d",
+	  group_element - EL_GROUP_START + 1);
+
+    /* replace element which caused too deep recursion by question mark */
+    group->element_resolved[group->num_elements_resolved++] = EL_UNKNOWN;
+
+    return;
+  }
+
+  if (recursion_depth == 0)			/* initialization */
+  {
+    group = actual_group;
+    group_nr = group_element - EL_GROUP_START;
+
+    group->num_elements_resolved = 0;
+    group->choice_pos = 0;
+  }
+
+  for (i = 0; i < actual_group->num_elements; i++)
+  {
+    int element = actual_group->element[i];
+
+    if (group->num_elements_resolved == NUM_FILE_ELEMENTS)
+      break;
+
+    if (IS_GROUP_ELEMENT(element))
+      resolve_group_element(element, recursion_depth + 1);
+    else
+    {
+      group->element_resolved[group->num_elements_resolved++] = element;
+      element_info[element].in_group[group_nr] = TRUE;
+    }
+  }
+}
+#endif
+
 void InitElementPropertiesStatic()
 {
   static int ep_diggable[] =
@@ -1786,6 +1871,7 @@ void InitElementPropertiesStatic()
     EL_SP_BUGGY_BASE_ACTIVE,
     EL_EMC_PLANT,
 #endif
+
     -1
   };
 
@@ -1810,6 +1896,7 @@ void InitElementPropertiesStatic()
     EL_EMC_KEY_7,
     EL_EMC_KEY_8,
     EL_DYNAMITE,
+    EL_EM_DYNAMITE,
     EL_DYNABOMB_INCREASE_NUMBER,
     EL_DYNABOMB_INCREASE_SIZE,
     EL_DYNABOMB_INCREASE_POWER,
@@ -1828,6 +1915,7 @@ void InitElementPropertiesStatic()
     EL_SPEED_PILL,
     EL_EMC_LENSES,
     EL_EMC_MAGNIFIER,
+
     -1
   };
 
@@ -1858,6 +1946,7 @@ void InitElementPropertiesStatic()
     EL_SP_BUGGY_BASE_ACTIVE,
     EL_EMC_PLANT,
 #endif
+
     -1
   };
 
@@ -1876,6 +1965,7 @@ void InitElementPropertiesStatic()
     EL_PACMAN,
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
+
     -1
   };
 
@@ -1885,6 +1975,7 @@ void InitElementPropertiesStatic()
     EL_SPACESHIP,
     EL_BD_BUTTERFLY,
     EL_BD_FIREFLY,
+
     -1
   };
 
@@ -2005,6 +2096,7 @@ void InitElementPropertiesStatic()
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
     EL_TUBE_RIGHT_DOWN,
+
     -1
   };
 
@@ -2046,6 +2138,9 @@ void InitElementPropertiesStatic()
     EL_EMC_WALL_SLIPPERY_2,
     EL_EMC_WALL_SLIPPERY_3,
     EL_EMC_WALL_SLIPPERY_4,
+    EL_EMC_MAGIC_BALL,
+    EL_EMC_MAGIC_BALL_ACTIVE,
+
     -1
   };
 
@@ -2075,6 +2170,7 @@ void InitElementPropertiesStatic()
     EL_BALLOON,
     EL_SPRING,
     EL_EMC_ANDROID,
+
     -1
   };
 
@@ -2103,6 +2199,7 @@ void InitElementPropertiesStatic()
     EL_CRYSTAL,
     EL_SPRING,
     EL_DX_SUPABOMB,
+
     -1
   };
 
@@ -2128,6 +2225,7 @@ void InitElementPropertiesStatic()
     EL_CRYSTAL,
     EL_SPRING,
     EL_DX_SUPABOMB,
+
     -1
   };
 
@@ -2136,6 +2234,7 @@ void InitElementPropertiesStatic()
     EL_ROCK,
     EL_BD_ROCK,
     EL_SP_ZONK,
+
     -1
   };
 
@@ -2144,6 +2243,7 @@ void InitElementPropertiesStatic()
     EL_ROCK,
     EL_BD_ROCK,
     EL_SP_ZONK,
+
     -1
   };
 
@@ -2161,8 +2261,10 @@ void InitElementPropertiesStatic()
     EL_MOLE,
 
     /* new elements */
-    EL_DYNAMITE_ACTIVE,
     EL_DYNAMITE,
+    EL_DYNAMITE_ACTIVE,
+    EL_EM_DYNAMITE,
+    EL_EM_DYNAMITE_ACTIVE,
     EL_DYNABOMB_PLAYER_1_ACTIVE,
     EL_DYNABOMB_PLAYER_2_ACTIVE,
     EL_DYNABOMB_PLAYER_3_ACTIVE,
@@ -2180,6 +2282,7 @@ void InitElementPropertiesStatic()
 #if 0
     EL_BLACK_ORB,
 #endif
+
     -1
   };
 
@@ -2195,6 +2298,7 @@ void InitElementPropertiesStatic()
     EL_PIG,
     EL_DRAGON,
     EL_MOLE,
+
     -1
   };
 
@@ -2203,6 +2307,7 @@ void InitElementPropertiesStatic()
     EL_BOMB,
     EL_SP_DISK_ORANGE,
     EL_DX_SUPABOMB,
+
     -1
   };
 
@@ -2229,6 +2334,7 @@ void InitElementPropertiesStatic()
     EL_PENGUIN,
     EL_PIG,
     EL_DRAGON,
+
     -1
   };
 
@@ -2245,6 +2351,7 @@ void InitElementPropertiesStatic()
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
     EL_TUBE_RIGHT_DOWN,
+
     -1
   };
 
@@ -2281,6 +2388,7 @@ void InitElementPropertiesStatic()
     EL_EMC_GATE_8_GRAY_ACTIVE,
     EL_SWITCHGATE_OPEN,
     EL_TIMEGATE_OPEN,
+
     -1
   };
 
@@ -2305,6 +2413,7 @@ void InitElementPropertiesStatic()
     EL_SP_GRAVITY_OFF_PORT_RIGHT,
     EL_SP_GRAVITY_OFF_PORT_UP,
     EL_SP_GRAVITY_OFF_PORT_DOWN,
+
     -1
   };
 
@@ -2340,6 +2449,7 @@ void InitElementPropertiesStatic()
     EL_SP_DISK_YELLOW,
     EL_BALLOON,
     EL_EMC_ANDROID,
+
     -1
   };
 
@@ -2411,6 +2521,7 @@ void InitElementPropertiesStatic()
     EL_SP_GRAVITY_OFF_PORT_RIGHT,
     EL_SP_GRAVITY_OFF_PORT_UP,
     EL_SP_GRAVITY_OFF_PORT_DOWN,
+
     -1
   };
 
@@ -2433,8 +2544,10 @@ void InitElementPropertiesStatic()
     EL_MOLE,
 
     /* elements that can explode by explosion or by dragonfire */
-    EL_DYNAMITE_ACTIVE,
     EL_DYNAMITE,
+    EL_DYNAMITE_ACTIVE,
+    EL_EM_DYNAMITE,
+    EL_EM_DYNAMITE_ACTIVE,
     EL_DYNABOMB_PLAYER_1_ACTIVE,
     EL_DYNABOMB_PLAYER_2_ACTIVE,
     EL_DYNABOMB_PLAYER_3_ACTIVE,
@@ -2452,6 +2565,7 @@ void InitElementPropertiesStatic()
 
     /* elements that can explode only by explosion */
     EL_BLACK_ORB,
+
     -1
   };
 
@@ -2482,6 +2596,7 @@ void InitElementPropertiesStatic()
     EL_SP_GRAVITY_OFF_PORT_UP,
     EL_SP_GRAVITY_OFF_PORT_DOWN,
     EL_EMC_GRASS,
+
     -1
   };
 
@@ -2494,6 +2609,7 @@ void InitElementPropertiesStatic()
     EL_SP_MURPHY,
     EL_SOKOBAN_FIELD_PLAYER,
     EL_TRIGGER_PLAYER,
+
     -1
   };
 
@@ -2507,6 +2623,7 @@ void InitElementPropertiesStatic()
     EL_EMERALD_RED,
     EL_EMERALD_PURPLE,
     EL_DIAMOND,
+
     -1
   };
 
@@ -2540,6 +2657,8 @@ void InitElementPropertiesStatic()
     EL_LAMP,
     EL_TIME_ORB_FULL,
     EL_EMC_MAGIC_BALL_SWITCH,
+    EL_EMC_MAGIC_BALL_SWITCH_ACTIVE,
+
     -1
   };
 
@@ -2573,6 +2692,7 @@ void InitElementPropertiesStatic()
     EL_BD_AMOEBA,
     EL_CHAR_QUESTION,
     EL_UNKNOWN,
+
     -1
   };
 
@@ -2647,6 +2767,7 @@ void InitElementPropertiesStatic()
     EL_SP_BUGGY_BASE_ACTIVE,
     EL_SP_EXIT_OPENING,
     EL_SP_EXIT_CLOSING,
+
     -1
   };
 
@@ -2663,6 +2784,7 @@ void InitElementPropertiesStatic()
     EL_PLAYER_3,
     EL_PLAYER_4,
     EL_INVISIBLE_STEELWALL,
+
     -1
   };
 
@@ -2674,6 +2796,7 @@ void InitElementPropertiesStatic()
     EL_EMERALD_RED,
     EL_EMERALD_PURPLE,
     EL_DIAMOND,
+
     -1
   };
 
@@ -2701,6 +2824,7 @@ void InitElementPropertiesStatic()
     EL_DIAMOND,
     EL_PEARL,
     EL_CRYSTAL,
+
     -1
   };
 
@@ -2714,6 +2838,7 @@ void InitElementPropertiesStatic()
     EL_DIAMOND,
     EL_PEARL,
     EL_CRYSTAL,
+
     -1
   };
 
@@ -2725,6 +2850,7 @@ void InitElementPropertiesStatic()
     EL_EMERALD_RED,
     EL_EMERALD_PURPLE,
     EL_DIAMOND,
+
     -1
   };
 
@@ -2803,6 +2929,7 @@ void InitElementPropertiesStatic()
     EL_EMC_WALL_6,
     EL_EMC_WALL_7,
     EL_EMC_WALL_8,
+
     -1
   };
 
@@ -2966,6 +3093,7 @@ void InitElementPropertiesStatic()
     EL_TUBE_LEFT_DOWN,
     EL_TUBE_RIGHT_UP,
     EL_TUBE_RIGHT_DOWN,
+
     -1
   };
 
@@ -2982,6 +3110,7 @@ void InitElementPropertiesStatic()
     EL_PACMAN,
     EL_SP_SNIKSNAK,
     EL_SP_ELECTRON,
+
     -1
   };
 
@@ -2999,6 +3128,7 @@ void InitElementPropertiesStatic()
     EL_CONVEYOR_BELT_4_LEFT,
     EL_CONVEYOR_BELT_4_MIDDLE,
     EL_CONVEYOR_BELT_4_RIGHT,
+
     -1
   };
 
@@ -3016,6 +3146,7 @@ void InitElementPropertiesStatic()
     EL_CONVEYOR_BELT_4_LEFT_ACTIVE,
     EL_CONVEYOR_BELT_4_MIDDLE_ACTIVE,
     EL_CONVEYOR_BELT_4_RIGHT_ACTIVE,
+
     -1
   };
 
@@ -3033,6 +3164,7 @@ void InitElementPropertiesStatic()
     EL_CONVEYOR_BELT_4_SWITCH_LEFT,
     EL_CONVEYOR_BELT_4_SWITCH_MIDDLE,
     EL_CONVEYOR_BELT_4_SWITCH_RIGHT,
+
     -1
   };
 
@@ -3049,6 +3181,7 @@ void InitElementPropertiesStatic()
     EL_TUBE_VERTICAL_LEFT,
     EL_TUBE_VERTICAL_RIGHT,
     EL_TUBE_ANY,
+
     -1
   };
 
@@ -3090,6 +3223,7 @@ void InitElementPropertiesStatic()
     EL_EMC_GATE_6_GRAY_ACTIVE,
     EL_EMC_GATE_7_GRAY_ACTIVE,
     EL_EMC_GATE_8_GRAY_ACTIVE,
+
     -1
   };
 
@@ -3100,6 +3234,8 @@ void InitElementPropertiesStatic()
     EL_AMOEBA_DRY,
     EL_AMOEBA_FULL,
     EL_BD_AMOEBA,
+    EL_EMC_DRIPPER,
+
     -1
   };
 
@@ -3109,16 +3245,30 @@ void InitElementPropertiesStatic()
     EL_AMOEBA_DRY,
     EL_AMOEBA_FULL,
     EL_BD_AMOEBA,
+    EL_EMC_DRIPPER,
+
     -1
   };
 
-  static int ep_has_content[] =
+  static int ep_has_editor_content[] =
   {
+    EL_PLAYER_1,
+    EL_PLAYER_2,
+    EL_PLAYER_3,
+    EL_PLAYER_4,
+    EL_SP_MURPHY,
     EL_YAMYAM,
+    EL_YAMYAM_LEFT,
+    EL_YAMYAM_RIGHT,
+    EL_YAMYAM_UP,
+    EL_YAMYAM_DOWN,
     EL_AMOEBA_WET,
     EL_AMOEBA_DRY,
     EL_AMOEBA_FULL,
     EL_BD_AMOEBA,
+    EL_EMC_MAGIC_BALL,
+    EL_EMC_ANDROID,
+
     -1
   };
 
@@ -3137,17 +3287,21 @@ void InitElementPropertiesStatic()
     EL_AMOEBA_FULL,
     EL_GAME_OF_LIFE,
     EL_BIOMAZE,
+    EL_EMC_DRIPPER,
+
     -1
   };
 
   static int ep_active_bomb[] =
   {
     EL_DYNAMITE_ACTIVE,
+    EL_EM_DYNAMITE_ACTIVE,
     EL_DYNABOMB_PLAYER_1_ACTIVE,
     EL_DYNABOMB_PLAYER_2_ACTIVE,
     EL_DYNABOMB_PLAYER_3_ACTIVE,
     EL_DYNABOMB_PLAYER_4_ACTIVE,
     EL_SP_DISK_RED_ACTIVE,
+
     -1
   };
 
@@ -3212,6 +3366,7 @@ void InitElementPropertiesStatic()
     EL_EMC_GATE_7_GRAY_ACTIVE,
     EL_EMC_GATE_8_GRAY_ACTIVE,
     EL_DYNAMITE,
+    EL_EM_DYNAMITE,
     EL_INVISIBLE_STEELWALL,
     EL_INVISIBLE_WALL,
     EL_INVISIBLE_SAND,
@@ -3332,6 +3487,7 @@ void InitElementPropertiesStatic()
     EL_EMC_WALL_14,
     EL_EMC_WALL_15,
     EL_EMC_WALL_16,
+
     -1
   };
 
@@ -3346,6 +3502,47 @@ void InitElementPropertiesStatic()
     EL_LANDMINE,
     EL_TRAP,
     EL_TRAP_ACTIVE,
+
+    -1
+  };
+
+  static int ep_editor_cascade_active[] =
+  {
+    EL_INTERNAL_CASCADE_BD_ACTIVE,
+    EL_INTERNAL_CASCADE_EM_ACTIVE,
+    EL_INTERNAL_CASCADE_EMC_ACTIVE,
+    EL_INTERNAL_CASCADE_RND_ACTIVE,
+    EL_INTERNAL_CASCADE_SB_ACTIVE,
+    EL_INTERNAL_CASCADE_SP_ACTIVE,
+    EL_INTERNAL_CASCADE_DC_ACTIVE,
+    EL_INTERNAL_CASCADE_DX_ACTIVE,
+    EL_INTERNAL_CASCADE_CHARS_ACTIVE,
+    EL_INTERNAL_CASCADE_CE_ACTIVE,
+    EL_INTERNAL_CASCADE_GE_ACTIVE,
+    EL_INTERNAL_CASCADE_USER_ACTIVE,
+    EL_INTERNAL_CASCADE_GENERIC_ACTIVE,
+    EL_INTERNAL_CASCADE_DYNAMIC_ACTIVE,
+
+    -1
+  };
+
+  static int ep_editor_cascade_inactive[] =
+  {
+    EL_INTERNAL_CASCADE_BD,
+    EL_INTERNAL_CASCADE_EM,
+    EL_INTERNAL_CASCADE_EMC,
+    EL_INTERNAL_CASCADE_RND,
+    EL_INTERNAL_CASCADE_SB,
+    EL_INTERNAL_CASCADE_SP,
+    EL_INTERNAL_CASCADE_DC,
+    EL_INTERNAL_CASCADE_DX,
+    EL_INTERNAL_CASCADE_CHARS,
+    EL_INTERNAL_CASCADE_CE,
+    EL_INTERNAL_CASCADE_GE,
+    EL_INTERNAL_CASCADE_USER,
+    EL_INTERNAL_CASCADE_GENERIC,
+    EL_INTERNAL_CASCADE_DYNAMIC,
+
     -1
   };
 
@@ -3355,68 +3552,71 @@ void InitElementPropertiesStatic()
     int property;
   } element_properties[] =
   {
-    { ep_diggable,		EP_DIGGABLE		},
-    { ep_collectible_only,	EP_COLLECTIBLE_ONLY	},
-    { ep_dont_run_into,		EP_DONT_RUN_INTO	},
-    { ep_dont_collide_with,	EP_DONT_COLLIDE_WITH	},
-    { ep_dont_touch,		EP_DONT_TOUCH		},
-    { ep_indestructible,	EP_INDESTRUCTIBLE	},
-    { ep_slippery,		EP_SLIPPERY		},
-    { ep_can_change,		EP_CAN_CHANGE		},
-    { ep_can_move,		EP_CAN_MOVE		},
-    { ep_can_fall,		EP_CAN_FALL		},
-    { ep_can_smash_player,	EP_CAN_SMASH_PLAYER	},
-    { ep_can_smash_enemies,	EP_CAN_SMASH_ENEMIES	},
-    { ep_can_smash_everything,	EP_CAN_SMASH_EVERYTHING	},
-    { ep_explodes_by_fire,	EP_EXPLODES_BY_FIRE	},
-    { ep_explodes_smashed,	EP_EXPLODES_SMASHED	},
-    { ep_explodes_impact,	EP_EXPLODES_IMPACT	},
-    { ep_walkable_over,		EP_WALKABLE_OVER	},
-    { ep_walkable_inside,	EP_WALKABLE_INSIDE	},
-    { ep_walkable_under,	EP_WALKABLE_UNDER	},
-    { ep_passable_over,		EP_PASSABLE_OVER	},
-    { ep_passable_inside,	EP_PASSABLE_INSIDE	},
-    { ep_passable_under,	EP_PASSABLE_UNDER	},
-    { ep_droppable,		EP_DROPPABLE		},
-    { ep_explodes_1x1_old,	EP_EXPLODES_1X1_OLD	},
-    { ep_pushable,		EP_PUSHABLE		},
-    { ep_explodes_cross_old,	EP_EXPLODES_CROSS_OLD	},
-    { ep_protected,		EP_PROTECTED		},
-    { ep_throwable,		EP_THROWABLE		},
-    { ep_can_explode,		EP_CAN_EXPLODE		},
-    { ep_gravity_reachable,	EP_GRAVITY_REACHABLE	},
-
-    { ep_player,		EP_PLAYER		},
-    { ep_can_pass_magic_wall,	EP_CAN_PASS_MAGIC_WALL	},
-    { ep_switchable,		EP_SWITCHABLE		},
-    { ep_bd_element,		EP_BD_ELEMENT		},
-    { ep_sp_element,		EP_SP_ELEMENT		},
-    { ep_sb_element,		EP_SB_ELEMENT		},
-    { ep_gem,			EP_GEM			},
-    { ep_food_dark_yamyam,	EP_FOOD_DARK_YAMYAM	},
-    { ep_food_penguin,		EP_FOOD_PENGUIN		},
-    { ep_food_pig,		EP_FOOD_PIG		},
-    { ep_historic_wall,		EP_HISTORIC_WALL	},
-    { ep_historic_solid,	EP_HISTORIC_SOLID	},
-    { ep_classic_enemy,		EP_CLASSIC_ENEMY	},
-    { ep_belt,			EP_BELT			},
-    { ep_belt_active,		EP_BELT_ACTIVE		},
-    { ep_belt_switch,		EP_BELT_SWITCH		},
-    { ep_tube,			EP_TUBE			},
-    { ep_keygate,		EP_KEYGATE		},
-    { ep_amoeboid,		EP_AMOEBOID		},
-    { ep_amoebalive,		EP_AMOEBALIVE		},
-    { ep_has_content,		EP_HAS_CONTENT		},
-    { ep_can_turn_each_move,	EP_CAN_TURN_EACH_MOVE	},
-    { ep_can_grow,		EP_CAN_GROW		},
-    { ep_active_bomb,		EP_ACTIVE_BOMB		},
-    { ep_inactive,		EP_INACTIVE		},
-
-    { ep_em_slippery_wall,	EP_EM_SLIPPERY_WALL	},
-
-    { ep_gfx_crumbled,		EP_GFX_CRUMBLED		},
-
-    { NULL,			-1			}
+    { ep_diggable,			EP_DIGGABLE			},
+    { ep_collectible_only,		EP_COLLECTIBLE_ONLY		},
+    { ep_dont_run_into,			EP_DONT_RUN_INTO		},
+    { ep_dont_collide_with,		EP_DONT_COLLIDE_WITH		},
+    { ep_dont_touch,			EP_DONT_TOUCH			},
+    { ep_indestructible,		EP_INDESTRUCTIBLE		},
+    { ep_slippery,			EP_SLIPPERY			},
+    { ep_can_change,			EP_CAN_CHANGE			},
+    { ep_can_move,			EP_CAN_MOVE			},
+    { ep_can_fall,			EP_CAN_FALL			},
+    { ep_can_smash_player,		EP_CAN_SMASH_PLAYER		},
+    { ep_can_smash_enemies,		EP_CAN_SMASH_ENEMIES		},
+    { ep_can_smash_everything,		EP_CAN_SMASH_EVERYTHING		},
+    { ep_explodes_by_fire,		EP_EXPLODES_BY_FIRE		},
+    { ep_explodes_smashed,		EP_EXPLODES_SMASHED		},
+    { ep_explodes_impact,		EP_EXPLODES_IMPACT		},
+    { ep_walkable_over,			EP_WALKABLE_OVER		},
+    { ep_walkable_inside,		EP_WALKABLE_INSIDE		},
+    { ep_walkable_under,		EP_WALKABLE_UNDER		},
+    { ep_passable_over,			EP_PASSABLE_OVER		},
+    { ep_passable_inside,		EP_PASSABLE_INSIDE		},
+    { ep_passable_under,		EP_PASSABLE_UNDER		},
+    { ep_droppable,			EP_DROPPABLE			},
+    { ep_explodes_1x1_old,		EP_EXPLODES_1X1_OLD		},
+    { ep_pushable,			EP_PUSHABLE			},
+    { ep_explodes_cross_old,		EP_EXPLODES_CROSS_OLD		},
+    { ep_protected,			EP_PROTECTED			},
+    { ep_throwable,			EP_THROWABLE			},
+    { ep_can_explode,			EP_CAN_EXPLODE			},
+    { ep_gravity_reachable,		EP_GRAVITY_REACHABLE		},
+
+    { ep_player,			EP_PLAYER			},
+    { ep_can_pass_magic_wall,		EP_CAN_PASS_MAGIC_WALL		},
+    { ep_switchable,			EP_SWITCHABLE			},
+    { ep_bd_element,			EP_BD_ELEMENT			},
+    { ep_sp_element,			EP_SP_ELEMENT			},
+    { ep_sb_element,			EP_SB_ELEMENT			},
+    { ep_gem,				EP_GEM				},
+    { ep_food_dark_yamyam,		EP_FOOD_DARK_YAMYAM		},
+    { ep_food_penguin,			EP_FOOD_PENGUIN			},
+    { ep_food_pig,			EP_FOOD_PIG			},
+    { ep_historic_wall,			EP_HISTORIC_WALL		},
+    { ep_historic_solid,		EP_HISTORIC_SOLID		},
+    { ep_classic_enemy,			EP_CLASSIC_ENEMY		},
+    { ep_belt,				EP_BELT				},
+    { ep_belt_active,			EP_BELT_ACTIVE			},
+    { ep_belt_switch,			EP_BELT_SWITCH			},
+    { ep_tube,				EP_TUBE				},
+    { ep_keygate,			EP_KEYGATE			},
+    { ep_amoeboid,			EP_AMOEBOID			},
+    { ep_amoebalive,			EP_AMOEBALIVE			},
+    { ep_has_editor_content,		EP_HAS_EDITOR_CONTENT		},
+    { ep_can_turn_each_move,		EP_CAN_TURN_EACH_MOVE		},
+    { ep_can_grow,			EP_CAN_GROW			},
+    { ep_active_bomb,			EP_ACTIVE_BOMB			},
+    { ep_inactive,			EP_INACTIVE			},
+
+    { ep_em_slippery_wall,		EP_EM_SLIPPERY_WALL		},
+
+    { ep_gfx_crumbled,			EP_GFX_CRUMBLED			},
+
+    { ep_editor_cascade_active,		EP_EDITOR_CASCADE_ACTIVE	},
+    { ep_editor_cascade_inactive, 	EP_EDITOR_CASCADE_INACTIVE	},
+
+    { NULL,				-1				}
   };
 
   int i, j, k;
@@ -3479,6 +3679,17 @@ void InitElementPropertiesEngine(int engine_version)
      property (which means that conditional property changes must be set to
      a reliable default value before) */
 
+#if 1
+  /* ---------- recursively resolve group elements ------------------------- */
+
+  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
+    for (j = 0; j < NUM_GROUP_ELEMENTS; j++)
+      element_info[i].in_group[j] = FALSE;
+
+  for (i = 0; i < NUM_GROUP_ELEMENTS; i++)
+    resolve_group_element(EL_GROUP_START + i, 0);
+#endif
+
   /* set all special, combined or engine dependent element properties */
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
@@ -3618,6 +3829,12 @@ void InitElementPropertiesEngine(int engine_version)
     SET_PROPERTY(i, EP_SP_PORT, (IS_SP_ELEMENT(i) &&
 				 IS_PASSABLE_INSIDE(i)));
 
+    /* ---------- CAN_BE_CLONED_BY_ANDROID --------------------------------- */
+    for (j = 0; j < level.num_android_clone_elements; j++)
+      SET_PROPERTY(i, EP_CAN_BE_CLONED_BY_ANDROID,
+		   (i != EL_EMPTY &&
+		    IS_EQUAL_OR_IN_GROUP(i, level.android_clone_element[j])));
+
     /* ---------- CAN_CHANGE ----------------------------------------------- */
     SET_PROPERTY(i, EP_CAN_CHANGE, FALSE);	/* default: cannot change */
     for (j = 0; j < element_info[i].num_change_pages; j++)
@@ -3644,6 +3861,10 @@ void InitElementPropertiesEngine(int engine_version)
     SET_PROPERTY(i, EP_GFX_CRUMBLED,
 		 element_info[i].crumbled[ACTION_DEFAULT] != IMG_EMPTY);
 #endif
+
+    /* ---------- EDITOR_CASCADE ------------------------------------------- */
+    SET_PROPERTY(i, EP_EDITOR_CASCADE, (IS_EDITOR_CASCADE_ACTIVE(i) ||
+					IS_EDITOR_CASCADE_INACTIVE(i)));
   }
 
   /* dynamically adjust element properties according to game engine version */
@@ -3802,6 +4023,10 @@ void Execute_Command(char *command)
     printf("# (The entries below are default and therefore commented out.)\n");
     printf("\n");
 
+    /* this is needed to be able to check element list for cascade elements */
+    InitElementPropertiesStatic();
+    InitElementPropertiesEngine(GAME_VERSION_ACTUAL);
+
     PrintEditorElementList();
 
     exit(0);
@@ -3997,7 +4222,7 @@ static void InitArtworkConfig()
   static char *sound_id_prefix[2 * MAX_NUM_ELEMENTS + 1];
   static char *music_id_prefix[NUM_MUSIC_PREFIXES + 1];
   static char *action_id_suffix[NUM_ACTIONS + 1];
-  static char *direction_id_suffix[NUM_DIRECTIONS + 1];
+  static char *direction_id_suffix[NUM_DIRECTIONS_FULL + 1];
   static char *special_id_suffix[NUM_SPECIAL_GFX_ARGS + 1];
   static char *level_id_suffix[MAX_LEVELS + 1];
   static char *dummy[1] = { NULL };
@@ -4071,9 +4296,9 @@ static void InitArtworkConfig()
     action_id_suffix[i] = element_action_info[i].suffix;
   action_id_suffix[NUM_ACTIONS] = NULL;
 
-  for (i = 0; i < NUM_DIRECTIONS; i++)
+  for (i = 0; i < NUM_DIRECTIONS_FULL; i++)
     direction_id_suffix[i] = element_direction_info[i].suffix;
-  direction_id_suffix[NUM_DIRECTIONS] = NULL;
+  direction_id_suffix[NUM_DIRECTIONS_FULL] = NULL;
 
   for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
     special_id_suffix[i] = special_suffix_info[i].suffix;
@@ -4383,14 +4608,20 @@ static char *getNewArtworkIdentifier(int type)
 
 void ReloadCustomArtwork(int force_reload)
 {
-  char *gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
-  char *snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
-  char *mus_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_MUSIC);
+  char *gfx_new_identifier;
+  char *snd_new_identifier;
+  char *mus_new_identifier;
   boolean force_reload_gfx = (force_reload & (1 << ARTWORK_TYPE_GRAPHICS));
   boolean force_reload_snd = (force_reload & (1 << ARTWORK_TYPE_SOUNDS));
   boolean force_reload_mus = (force_reload & (1 << ARTWORK_TYPE_MUSIC));
   boolean redraw_screen = FALSE;
 
+  force_reload_gfx |= AdjustGraphicsForEMC();
+
+  gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
+  snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
+  mus_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_MUSIC);
+
   if (gfx_new_identifier != NULL || force_reload_gfx)
   {
 #if 0