X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=7132ab78c99a89f07aad6e8ee759c55c1436194d;hb=76b3cb92402127cde194888bab57397eca735220;hp=9a68e2ad5ebc7b8c0c38f07078c6846320f05a17;hpb=d5224fde97c235c903f631a4eccb9904c2ddf9c3;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 9a68e2ad..7132ab78 100644
--- a/src/init.c
+++ b/src/init.c
@@ -411,30 +411,59 @@ void InitElementGraphicInfo()
     for (act=0; act<NUM_ACTIONS; act++)
     {
       element_info[i].graphic[act] = -1;
+      element_info[i].crumbled[act] = -1;
 
       for (dir=0; dir<NUM_DIRECTIONS; dir++)
+      {
 	element_info[i].direction_graphic[act][dir] = -1;
+	element_info[i].direction_crumbled[act][dir] = -1;
+      }
     }
   }
 
   /* initialize normal element/graphic mapping from static configuration */
   for (i=0; element_to_graphic[i].element > -1; i++)
   {
-    int element   = element_to_graphic[i].element;
-    int action    = element_to_graphic[i].action;
-    int direction = element_to_graphic[i].direction;
-    int graphic   = element_to_graphic[i].graphic;
+    int element      = element_to_graphic[i].element;
+    int action       = element_to_graphic[i].action;
+    int direction    = element_to_graphic[i].direction;
+    boolean crumbled = element_to_graphic[i].crumbled;
+    int graphic      = element_to_graphic[i].graphic;
 
     if (graphic_info[graphic].bitmap == NULL)
       continue;
 
+    if ((action > -1 || direction > -1 || crumbled == TRUE) &&
+	el2img(element) != -1)
+    {
+      boolean base_redefined = getImageListEntry(el2img(element))->redefined;
+      boolean act_dir_redefined = getImageListEntry(graphic)->redefined;
+
+      /* if the base graphic ("emerald", for example) has been redefined,
+      	 but not the action graphic ("emerald.falling", for example), do not
+	 use an existing (in this case considered obsolete) action graphic
+	 anymore, but use the automatically determined default graphic */
+      if (base_redefined && !act_dir_redefined)
+	continue;
+    }
+
     if (action < 0)
       action = ACTION_DEFAULT;
 
-    if (direction > -1)
-      element_info[element].direction_graphic[action][direction] = graphic;
+    if (crumbled)
+    {
+      if (direction > -1)
+	element_info[element].direction_crumbled[action][direction] = graphic;
+      else
+	element_info[element].crumbled[action] = graphic;
+    }
     else
-      element_info[element].graphic[action] = graphic;
+    {
+      if (direction > -1)
+	element_info[element].direction_graphic[action][direction] = graphic;
+      else
+	element_info[element].graphic[action] = graphic;
+    }
   }
 
   /* initialize normal element/graphic mapping from dynamic configuration */
@@ -445,6 +474,13 @@ void InitElementGraphicInfo()
     int direction = property_mapping[i].ext2_index;
     int special   = property_mapping[i].ext3_index;
     int graphic   = property_mapping[i].artwork_index;
+    boolean crumbled = FALSE;
+
+    if (special == GFX_SPECIAL_ARG_CRUMBLED)
+    {
+      special = -1;
+      crumbled = TRUE;
+    }
 
     if (graphic_info[graphic].bitmap == NULL)
       continue;
@@ -455,54 +491,147 @@ void InitElementGraphicInfo()
     if (action < 0)
       action = ACTION_DEFAULT;
 
-    if (direction > -1)
-      element_info[element].direction_graphic[action][direction] = graphic;
+    if (crumbled)
+    {
+      if (direction < 0)
+	for (dir=0; dir<NUM_DIRECTIONS; dir++)
+	  element_info[element].direction_crumbled[action][dir] = -1;
+
+      if (direction > -1)
+	element_info[element].direction_crumbled[action][direction] = graphic;
+      else
+	element_info[element].crumbled[action] = graphic;
+    }
     else
-      element_info[element].graphic[action] = graphic;
+    {
+      if (direction < 0)
+	for (dir=0; dir<NUM_DIRECTIONS; dir++)
+	  element_info[element].direction_graphic[action][dir] = -1;
+
+      if (direction > -1)
+	element_info[element].direction_graphic[action][direction] = graphic;
+      else
+	element_info[element].graphic[action] = graphic;
+    }
+  }
+
+  /* now copy all graphics that are defined to be cloned from other graphics */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  {
+    int graphic = element_info[i].graphic[ACTION_DEFAULT];
+    int crumbled_like, diggable_like;
+
+    if (graphic == -1)
+      continue;
+
+    crumbled_like = graphic_info[graphic].crumbled_like;
+    diggable_like = graphic_info[graphic].diggable_like;
+
+    if (crumbled_like != -1 && element_info[i].crumbled[ACTION_DEFAULT] == -1)
+    {
+      for (act=0; act<NUM_ACTIONS; act++)
+	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++)
+	  element_info[i].direction_crumbled[act][dir] =
+	    element_info[crumbled_like].direction_crumbled[act][dir];
+    }
+
+    if (diggable_like != -1 && element_info[i].graphic[ACTION_DIGGING] == -1)
+    {
+      element_info[i].graphic[ACTION_DIGGING] =
+	element_info[diggable_like].graphic[ACTION_DIGGING];
+      for (dir=0; dir<NUM_DIRECTIONS; dir++)
+	element_info[i].direction_graphic[ACTION_DIGGING][dir] =
+	  element_info[diggable_like].direction_graphic[ACTION_DIGGING][dir];
+    }
   }
 
   /* now set all '-1' values to element specific default values */
   for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    int default_action_graphic = element_info[i].graphic[ACTION_DEFAULT];
-    int default_action_direction_graphic[NUM_DIRECTIONS];
+    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];
 
-    if (default_action_graphic == -1)
-      default_action_graphic = IMG_CHAR_QUESTION;
+    if (default_graphic == -1)
+      default_graphic = IMG_CHAR_QUESTION;
+    if (default_crumbled == -1)
+      default_crumbled = IMG_EMPTY;
 
     for (dir=0; dir<NUM_DIRECTIONS; dir++)
     {
-      default_action_direction_graphic[dir] =
+      default_direction_graphic[dir] =
 	element_info[i].direction_graphic[ACTION_DEFAULT][dir];
+      default_direction_crumbled[dir] =
+	element_info[i].direction_crumbled[ACTION_DEFAULT][dir];
 
-      if (default_action_direction_graphic[dir] == -1)
-	default_action_direction_graphic[dir] = default_action_graphic;
+      if (default_direction_graphic[dir] == -1)
+	default_direction_graphic[dir] = default_graphic;
+      if (default_direction_crumbled[dir] == -1)
+	default_direction_crumbled[dir] = default_crumbled;
     }
 
     for (act=0; act<NUM_ACTIONS; act++)
     {
-      boolean act_empty = (act == ACTION_DIGGING ||
-			   act == ACTION_SNAPPING ||
-			   act == ACTION_COLLECTING);
+      boolean act_remove = (act == ACTION_DIGGING ||
+			    act == ACTION_SNAPPING ||
+			    act == ACTION_COLLECTING);
+
+      /* generic default action graphic (defined by "[default]" directive) */
+      int default_action_graphic = element_info[EL_DEFAULT].graphic[act];
+      int default_action_crumbled = element_info[EL_DEFAULT].crumbled[act];
+
+      /* look for special default action graphic (classic game specific) */
+      if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].graphic[act] != -1)
+	default_action_graphic = element_info[EL_BD_DEFAULT].graphic[act];
+      if (IS_SP_ELEMENT(i) && element_info[EL_SP_DEFAULT].graphic[act] != -1)
+	default_action_graphic = element_info[EL_SP_DEFAULT].graphic[act];
+      if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].graphic[act] != -1)
+	default_action_graphic = element_info[EL_SB_DEFAULT].graphic[act];
+
+      if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].crumbled[act] != -1)
+	default_action_crumbled = element_info[EL_BD_DEFAULT].crumbled[act];
+      if (IS_SP_ELEMENT(i) && element_info[EL_SP_DEFAULT].crumbled[act] != -1)
+	default_action_crumbled = element_info[EL_SP_DEFAULT].crumbled[act];
+      if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].crumbled[act] != -1)
+	default_action_crumbled = element_info[EL_SB_DEFAULT].crumbled[act];
+
+      if (default_action_graphic == -1)
+	default_action_graphic = default_graphic;
+      if (default_action_crumbled == -1)
+	default_action_crumbled = default_crumbled;
 
       for (dir=0; dir<NUM_DIRECTIONS; dir++)
       {
-	int default_direction_graphic = element_info[i].graphic[act];
+	int default_action_direction_graphic = element_info[i].graphic[act];
+	int default_action_direction_crumbled = element_info[i].crumbled[act];
 
 	/* no graphic for current action -- use default direction graphic */
-	if (default_direction_graphic == -1)
-	  default_direction_graphic =
-	    (act_empty ? IMG_EMPTY : default_action_direction_graphic[dir]);
+	if (default_action_direction_graphic == -1)
+	  default_action_direction_graphic =
+	    (act_remove ? IMG_EMPTY : default_direction_graphic[dir]);
+	if (default_action_direction_crumbled == -1)
+	  default_action_direction_crumbled =
+	    (act_remove ? IMG_EMPTY : default_direction_crumbled[dir]);
 
 	if (element_info[i].direction_graphic[act][dir] == -1)
 	  element_info[i].direction_graphic[act][dir] =
-	    default_direction_graphic;
+	    default_action_direction_graphic;
+	if (element_info[i].direction_crumbled[act][dir] == -1)
+	  element_info[i].direction_crumbled[act][dir] =
+	    default_action_direction_crumbled;
       }
 
       /* no graphic for this specific action -- use default action graphic */
       if (element_info[i].graphic[act] == -1)
 	element_info[i].graphic[act] =
-	  (act_empty ? IMG_EMPTY : default_action_graphic);
+	  (act_remove ? IMG_EMPTY : default_action_graphic);
+      if (element_info[i].crumbled[act] == -1)
+	element_info[i].crumbled[act] =
+	  (act_remove ? IMG_EMPTY : default_action_crumbled);
     }
   }
 
@@ -541,6 +670,10 @@ void InitElementSpecialGraphicInfo()
     boolean base_redefined = getImageListEntry(el2img(element))->redefined;
     boolean special_redefined = getImageListEntry(graphic)->redefined;
 
+    /* if the base graphic ("emerald", for example) has been redefined,
+       but not the special graphic ("emerald.EDITOR", for example), do not
+       use an existing (in this case considered obsolete) special graphic
+       anymore, but use the automatically created (down-scaled) graphic */
     if (base_redefined && !special_redefined)
       continue;
 
@@ -562,6 +695,17 @@ void InitElementSpecialGraphicInfo()
   }
 }
 
+static int get_element_from_token(char *token)
+{
+  int i;
+
+  for (i=0; i < MAX_NUM_ELEMENTS; i++)
+    if (strcmp(element_info[i].token_name, token) == 0)
+      return i;
+
+  return -1;
+}
+
 static void set_graphic_parameters(int graphic, char **parameter_raw)
 {
   Bitmap *src_bitmap = getBitmapFromImageID(graphic);
@@ -572,10 +716,15 @@ static void set_graphic_parameters(int graphic, char **parameter_raw)
 
   /* get integer values from string parameters */
   for (i=0; i < NUM_GFX_ARGS; i++)
+  {
     parameter[i] =
       get_parameter_value(image_config_suffix[i].token, parameter_raw[i],
 			  image_config_suffix[i].type);
 
+    if (image_config_suffix[i].type == TYPE_TOKEN)
+      parameter[i] = get_element_from_token(parameter_raw[i]);
+  }
+
   graphic_info[graphic].bitmap = src_bitmap;
 
   /* start with reliable default values */
@@ -585,6 +734,8 @@ static void set_graphic_parameters(int graphic, char **parameter_raw)
   graphic_info[graphic].height = TILEY;
   graphic_info[graphic].offset_x = 0;	/* one or both of these values ... */
   graphic_info[graphic].offset_y = 0;	/* ... will be corrected later */
+  graphic_info[graphic].crumbled_like = -1;	/* do not use clone element */
+  graphic_info[graphic].diggable_like = -1;	/* do not use clone element */
 
   /* optional x and y tile position of animation frame sequence */
   if (parameter[GFX_ARG_XPOS] != ARG_UNDEFINED_VALUE)
@@ -610,7 +761,7 @@ static void set_graphic_parameters(int graphic, char **parameter_raw)
     anim_frames_per_col = src_bitmap->height / graphic_info[graphic].height;
   }
 
-  /* correct x or y offset dependant of vertical or horizontal frame order */
+  /* correct x or y offset dependent of vertical or horizontal frame order */
   if (parameter[GFX_ARG_VERTICAL])	/* frames are ordered vertically */
   {
     graphic_info[graphic].offset_y =
@@ -666,6 +817,14 @@ static void set_graphic_parameters(int graphic, char **parameter_raw)
   /* animation synchronized with global frame counter, not move position */
   graphic_info[graphic].anim_global_sync = parameter[GFX_ARG_GLOBAL_SYNC];
 
+  /* optional element for cloning crumble graphics */
+  if (parameter[GFX_ARG_CRUMBLED_LIKE] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].crumbled_like = parameter[GFX_ARG_CRUMBLED_LIKE];
+
+  /* optional element for cloning digging graphics */
+  if (parameter[GFX_ARG_DIGGABLE_LIKE] != ARG_UNDEFINED_VALUE)
+    graphic_info[graphic].diggable_like = parameter[GFX_ARG_DIGGABLE_LIKE];
+
   /* this is only used for toon animations */
   graphic_info[graphic].step_offset = parameter[GFX_ARG_STEP_OFFSET];
   graphic_info[graphic].step_delay  = parameter[GFX_ARG_STEP_DELAY];
@@ -719,6 +878,16 @@ static void InitGraphicInfo()
     int src_x, src_y;
     int first_frame, last_frame;
 
+#if 0
+    printf("::: image: '%s'\n", image->token);
+#endif
+
+#if 0
+    printf("::: image # %d: '%s' ['%s']\n",
+	   i, image->token,
+	   getTokenFromImageID(i));
+#endif
+
     set_graphic_parameters(i, image->parameter);
 
     /* now check if no animation frames are outside of the loaded image */
@@ -851,48 +1020,61 @@ static void InitElementSoundInfo()
 	  element_info[j].sound[action] = sound;
   }
 
-  /* initialize element/sound mapping from dynamic configuration */
+  /* initialize element class/sound mapping from dynamic configuration */
   for (i=0; i < num_property_mappings; i++)
   {
-    int element = property_mapping[i].base_index;
-    int action  = property_mapping[i].ext1_index;
-    int sound   = property_mapping[i].artwork_index;
+    int element_class = property_mapping[i].base_index - MAX_NUM_ELEMENTS;
+    int action        = property_mapping[i].ext1_index;
+    int sound         = property_mapping[i].artwork_index;
 
-    if (element >= MAX_NUM_ELEMENTS)
+    if (element_class < 0 || element_class >= MAX_NUM_ELEMENTS)
       continue;
 
     if (action < 0)
       action = ACTION_DEFAULT;
 
-    element_info[element].sound[action] = sound;
+    for (j=0; j < MAX_NUM_ELEMENTS; j++)
+      if (strcmp(element_info[j].class_name,
+		 element_info[element_class].class_name) == 0)
+	element_info[j].sound[action] = sound;
   }
 
-  /* initialize element class/sound mapping from dynamic configuration */
+  /* initialize element/sound mapping from dynamic configuration */
   for (i=0; i < num_property_mappings; i++)
   {
-    int element_class = property_mapping[i].base_index - MAX_NUM_ELEMENTS;
-    int action        = property_mapping[i].ext1_index;
-    int sound         = property_mapping[i].artwork_index;
+    int element = property_mapping[i].base_index;
+    int action  = property_mapping[i].ext1_index;
+    int sound   = property_mapping[i].artwork_index;
 
-    if (element_class < 0 || element_class >= MAX_NUM_ELEMENTS)
+    if (element >= MAX_NUM_ELEMENTS)
       continue;
 
     if (action < 0)
       action = ACTION_DEFAULT;
 
-    for (j=0; j < MAX_NUM_ELEMENTS; j++)
-      if (strcmp(element_info[j].class_name,
-		 element_info[element_class].class_name) == 0)
-	element_info[j].sound[action] = sound;
+    element_info[element].sound[action] = sound;
   }
 
   /* now set all '-1' values to element specific default values */
   for (i=0; i<MAX_NUM_ELEMENTS; i++)
   {
-    int default_action_sound = element_info[i].sound[ACTION_DEFAULT];
-
     for (act=0; act < NUM_ACTIONS; act++)
     {
+      /* generic default action sound (defined by "[default]" directive) */
+      int default_action_sound = element_info[EL_DEFAULT].sound[act];
+
+      /* look for special default action sound (classic game specific) */
+      if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].sound[act] != -1)
+	default_action_sound = element_info[EL_BD_DEFAULT].sound[act];
+      if (IS_SP_ELEMENT(i) && element_info[EL_SP_DEFAULT].sound[act] != -1)
+	default_action_sound = element_info[EL_SP_DEFAULT].sound[act];
+      if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].sound[act] != -1)
+	default_action_sound = element_info[EL_SB_DEFAULT].sound[act];
+
+      /* look for element specific default sound (independent from action) */
+      if (element_info[i].sound[ACTION_DEFAULT] != -1)
+	default_action_sound = element_info[i].sound[ACTION_DEFAULT];
+
       /* no sound for this specific action -- use default action sound */
       if (element_info[i].sound[act] == -1)
 	element_info[i].sound[act] = default_action_sound;
@@ -918,8 +1100,10 @@ static void set_sound_parameters(int sound, char **parameter_raw)
 
 static void InitSoundInfo()
 {
+#if 0
   struct PropertyMapping *property_mapping = getSoundListPropertyMapping();
   int num_property_mappings = getSoundListPropertyMappingSize();
+#endif
   int *sound_effect_properties;
   int num_sounds = getSoundListSize();
   int i, j;
@@ -943,6 +1127,10 @@ static void InitSoundInfo()
     sound_effect_properties[i] = ACTION_OTHER;
     sound_info[i].loop = FALSE;
 
+#if 0
+    printf("::: sound %d: '%s'\n", i, sound->token);
+#endif
+
     /* determine all loop sounds and identify certain sound classes */
 
     for (j=0; element_action_info[j].suffix; j++)
@@ -954,12 +1142,17 @@ static void InitSoundInfo()
 		 element_action_info[j].suffix) == 0)
       {
 	sound_effect_properties[i] = element_action_info[j].value;
+	sound_info[i].loop = element_action_info[j].is_loop_sound;
 
-	if (element_action_info[j].is_loop_sound)
-	  sound_info[i].loop = TRUE;
+	break;
       }
     }
 
+#if 0
+    if (strcmp(sound->token, "custom_42") == 0)
+      printf("::: '%s' -> %d\n", sound->token, sound_info[i].loop);
+#endif
+
     /* associate elements and some selected sound actions */
 
     for (j=0; j<MAX_NUM_ELEMENTS; j++)
@@ -985,6 +1178,8 @@ static void InitSoundInfo()
 
   free(sound_effect_properties);
 
+#if 0
+  /* !!! now handled in InitElementSoundInfo() !!! */
   /* initialize element/sound mapping from dynamic configuration */
   for (i=0; i < num_property_mappings; i++)
   {
@@ -995,8 +1190,12 @@ static void InitSoundInfo()
     if (action < 0)
       action = ACTION_DEFAULT;
 
+    printf("::: %d: %d, %d, %d ['%s']\n",
+	   i, element, action, sound, element_info[element].token_name);
+
     element_info[element].sound[action] = sound;
   }
+#endif
 
 #if 0
   /* TEST ONLY */
@@ -1056,10 +1255,6 @@ static void ReinitializeSounds()
   InitSoundInfo();		/* sound properties mapping */
   InitElementSoundInfo();	/* element game sound mapping */
 
-#if 1
-  InitElementSoundInfo();	/* element game sound mapping */
-#endif
-
   InitPlaySoundLevel();		/* internal game sound settings */
 }
 
@@ -1079,7 +1274,9 @@ void InitElementPropertiesStatic()
     EL_TRAP,
     EL_INVISIBLE_SAND,
     EL_INVISIBLE_SAND_ACTIVE,
-#if 1
+
+    /* !!! currently not diggable, but handled by 'ep_dont_run_into' !!! */
+#if 0
     EL_LANDMINE,
     EL_TRAP_ACTIVE,
     EL_SP_BUGGY_BASE_ACTIVE,
@@ -1087,7 +1284,7 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_collectible[] =
+  static int ep_collectible_only[] =
   {
     EL_BD_DIAMOND,
     EL_EMERALD,
@@ -1120,6 +1317,62 @@ void InitElementPropertiesStatic()
     -1
   };
 
+  static int ep_dont_run_into[] =
+  {
+    /* same elements as in 'ep_dont_touch' */
+    EL_BUG,
+    EL_SPACESHIP,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
+
+    /* same elements as in 'ep_dont_collide_with' */
+    EL_YAMYAM,
+    EL_DARK_YAMYAM,
+    EL_ROBOT,
+    EL_PACMAN,
+    EL_SP_SNIKSNAK,
+    EL_SP_ELECTRON,
+
+    /* new elements */
+    EL_AMOEBA_DROP,
+    EL_ACID,
+
+    /* !!! maybe this should better be handled by 'ep_diggable' !!! */
+#if 1
+    EL_SP_BUGGY_BASE_ACTIVE,
+    EL_TRAP_ACTIVE,
+    EL_LANDMINE,
+#endif
+    -1
+  };
+
+  static int ep_dont_collide_with[] =
+  {
+    /* same elements as in 'ep_dont_touch' */
+    EL_BUG,
+    EL_SPACESHIP,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
+
+    /* new elements */
+    EL_YAMYAM,
+    EL_DARK_YAMYAM,
+    EL_ROBOT,
+    EL_PACMAN,
+    EL_SP_SNIKSNAK,
+    EL_SP_ELECTRON,
+    -1
+  };
+
+  static int ep_dont_touch[] =
+  {
+    EL_BUG,
+    EL_SPACESHIP,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
+    -1
+  };
+
   static int ep_indestructible[] =
   {
     EL_STEELWALL,
@@ -1168,7 +1421,7 @@ void InitElementPropertiesStatic()
     EL_SIGN_EXIT,
     EL_SIGN_YINYANG,
     EL_SIGN_OTHER,
-    EL_STEELWALL_SLANTED,
+    EL_STEELWALL_SLIPPERY,
     EL_EMC_STEELWALL_1,
     EL_EMC_STEELWALL_2,
     EL_EMC_STEELWALL_3,
@@ -1194,10 +1447,18 @@ void InitElementPropertiesStatic()
     EL_SWITCHGATE_OPENING,
     EL_SWITCHGATE_CLOSED,
     EL_SWITCHGATE_CLOSING,
+#if 0
+    EL_SWITCHGATE_SWITCH_UP,
+    EL_SWITCHGATE_SWITCH_DOWN,
+#endif
     EL_TIMEGATE_OPEN,
     EL_TIMEGATE_OPENING,
     EL_TIMEGATE_CLOSED,
     EL_TIMEGATE_CLOSING,
+#if 0
+    EL_TIMEGATE_SWITCH,
+    EL_TIMEGATE_SWITCH_ACTIVE,
+#endif
     EL_TUBE_ANY,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
@@ -1214,7 +1475,7 @@ void InitElementPropertiesStatic()
 
   static int ep_slippery[] =
   {
-    EL_WALL_CRUMBLED,
+    EL_WALL_SLIPPERY,
     EL_BD_WALL,
     EL_ROCK,
     EL_BD_ROCK,
@@ -1243,12 +1504,39 @@ void InitElementPropertiesStatic()
     EL_SP_CHIP_TOP,
     EL_SP_CHIP_BOTTOM,
     EL_SPEED_PILL,
-    EL_STEELWALL_SLANTED,
+    EL_STEELWALL_SLIPPERY,
     EL_PEARL,
     EL_CRYSTAL,
     -1
   };
 
+  static int ep_can_change[] =
+  {
+    -1
+  };
+
+  static int ep_can_move[] =
+  {
+    EL_BUG,
+    EL_SPACESHIP,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
+    EL_YAMYAM,
+    EL_DARK_YAMYAM,
+    EL_ROBOT,
+    EL_PACMAN,
+    EL_MOLE,
+    EL_PENGUIN,
+    EL_PIG,
+    EL_DRAGON,
+    EL_SATELLITE,
+    EL_SP_SNIKSNAK,
+    EL_SP_ELECTRON,
+    EL_BALLOON,
+    EL_SPRING,
+    -1
+  };
+
   static int ep_can_fall[] =
   {
     EL_ROCK,
@@ -1277,7 +1565,7 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_can_smash[] =
+  static int ep_can_smash_player[] =
   {
     EL_ROCK,
     EL_BD_ROCK,
@@ -1302,6 +1590,78 @@ void InitElementPropertiesStatic()
     -1
   };
 
+  static int ep_can_smash_enemies[] =
+  {
+    EL_ROCK,
+    EL_BD_ROCK,
+    EL_SP_ZONK,
+    -1
+  };
+
+  static int ep_can_smash_everything[] =
+  {
+    EL_ROCK,
+    EL_BD_ROCK,
+    EL_SP_ZONK,
+    -1
+  };
+
+  static int ep_can_explode_by_fire[] =
+  {
+    /* same elements as in 'ep_can_explode_impact' */
+    EL_BOMB,
+    EL_SP_DISK_ORANGE,
+    EL_DX_SUPABOMB,
+
+    /* same elements as in 'ep_can_explode_smashed' */
+    EL_SATELLITE,
+    EL_PIG,
+    EL_DRAGON,
+    EL_MOLE,
+
+    /* new elements */
+    EL_DYNAMITE_ACTIVE,
+    EL_DYNAMITE,
+    EL_DYNABOMB_PLAYER_1_ACTIVE,
+    EL_DYNABOMB_PLAYER_2_ACTIVE,
+    EL_DYNABOMB_PLAYER_3_ACTIVE,
+    EL_DYNABOMB_PLAYER_4_ACTIVE,
+    EL_DYNABOMB_INCREASE_NUMBER,
+    EL_DYNABOMB_INCREASE_SIZE,
+    EL_DYNABOMB_INCREASE_POWER,
+    EL_SP_DISK_RED_ACTIVE,
+    EL_BUG,
+    EL_PENGUIN,
+    EL_SP_DISK_RED,
+    EL_SP_DISK_YELLOW,
+    EL_SP_SNIKSNAK,
+    EL_SP_ELECTRON,
+    -1
+  };
+
+  static int ep_can_explode_smashed[] =
+  {
+    /* same elements as in 'ep_can_explode_impact' */
+    EL_BOMB,
+    EL_SP_DISK_ORANGE,
+    EL_DX_SUPABOMB,
+
+    /* new elements */
+    EL_SATELLITE,
+    EL_PIG,
+    EL_DRAGON,
+    EL_MOLE,
+    -1
+  };
+
+  static int ep_can_explode_impact[] =
+  {
+    EL_BOMB,
+    EL_SP_DISK_ORANGE,
+    EL_DX_SUPABOMB,
+    -1
+  };
+
   static int ep_walkable_over[] =
   {
     EL_EMPTY_SPACE,
@@ -1317,6 +1677,9 @@ void InitElementPropertiesStatic()
     EL_GATE_2_GRAY,
     EL_GATE_3_GRAY,
     EL_GATE_4_GRAY,
+    EL_PENGUIN,
+    EL_PIG,
+    EL_DRAGON,
     -1
   };
 
@@ -1380,28 +1743,19 @@ void InitElementPropertiesStatic()
   static int ep_pushable[] =
   {
     EL_ROCK,
-    EL_BD_ROCK,
     EL_BOMB,
+    EL_DX_SUPABOMB,
     EL_NUT,
     EL_TIME_ORB_EMPTY,
-    EL_SOKOBAN_FIELD_FULL,
-    EL_SOKOBAN_OBJECT,
-    EL_SATELLITE,
     EL_SP_ZONK,
     EL_SP_DISK_ORANGE,
+    EL_SPRING,
+    EL_BD_ROCK,
+    EL_SOKOBAN_OBJECT,
+    EL_SOKOBAN_FIELD_FULL,
+    EL_SATELLITE,
     EL_SP_DISK_YELLOW,
     EL_BALLOON,
-    EL_SPRING,
-    EL_DX_SUPABOMB,
-    -1
-  };
-
-  static int ep_player[] =
-  {
-    EL_PLAYER_1,
-    EL_PLAYER_2,
-    EL_PLAYER_3,
-    EL_PLAYER_4,
     -1
   };
 
@@ -1414,52 +1768,16 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_can_move[] =
+  static int ep_player[] =
   {
-    /* only stored in level file */
-    EL_BUG_RIGHT,
-    EL_BUG_UP,
-    EL_BUG_LEFT,
-    EL_BUG_DOWN,
-    EL_SPACESHIP_RIGHT,
-    EL_SPACESHIP_UP,
-    EL_SPACESHIP_LEFT,
-    EL_SPACESHIP_DOWN,
-    EL_BD_BUTTERFLY_RIGHT,
-    EL_BD_BUTTERFLY_UP,
-    EL_BD_BUTTERFLY_LEFT,
-    EL_BD_BUTTERFLY_DOWN,
-    EL_BD_FIREFLY_RIGHT,
-    EL_BD_FIREFLY_UP,
-    EL_BD_FIREFLY_LEFT,
-    EL_BD_FIREFLY_DOWN,
-    EL_PACMAN_RIGHT,
-    EL_PACMAN_UP,
-    EL_PACMAN_LEFT,
-    EL_PACMAN_DOWN,
-
-    /* level file and runtime elements */
-    EL_BUG,
-    EL_SPACESHIP,
-    EL_BD_BUTTERFLY,
-    EL_BD_FIREFLY,
-    EL_YAMYAM,
-    EL_DARK_YAMYAM,
-    EL_ROBOT,
-    EL_PACMAN,
-    EL_MOLE,
-    EL_PENGUIN,
-    EL_PIG,
-    EL_DRAGON,
-    EL_SATELLITE,
-    EL_SP_SNIKSNAK,
-    EL_SP_ELECTRON,
-    EL_BALLOON,
-    EL_SPRING,
+    EL_PLAYER_1,
+    EL_PLAYER_2,
+    EL_PLAYER_3,
+    EL_PLAYER_4,
     -1
   };
 
-  static int ep_can_change[] =
+  static int ep_can_pass_magic_wall[] =
   {
     EL_ROCK,
     EL_BD_ROCK,
@@ -1472,75 +1790,34 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_dont_touch[] =
-  {
-    EL_BUG,
-    EL_SPACESHIP,
-    EL_BD_BUTTERFLY,
-    EL_BD_FIREFLY,
-    -1
-  };
-
-  static int ep_enemy[] =
-  {
-    EL_BUG,
-    EL_SPACESHIP,
-    EL_BD_BUTTERFLY,
-    EL_BD_FIREFLY,
-    EL_YAMYAM,
-    EL_DARK_YAMYAM,
-    EL_ROBOT,
-    EL_PACMAN,
-    EL_SP_SNIKSNAK,
-    EL_SP_ELECTRON,
-    -1
-  };
-
-  static int ep_dont_go_to[] =
-  {
-    EL_BUG,
-    EL_SPACESHIP,
-    EL_BD_BUTTERFLY,
-    EL_BD_FIREFLY,
-    EL_YAMYAM,
-    EL_DARK_YAMYAM,
-    EL_ROBOT,
-    EL_PACMAN,
-    EL_AMOEBA_DROP,
-    EL_ACID,
-    EL_SP_SNIKSNAK,
-    EL_SP_ELECTRON,
-    EL_SP_BUGGY_BASE_ACTIVE,
-    EL_TRAP_ACTIVE,
-    EL_LANDMINE,
-    -1
-  };
-
-  static int ep_explosive[] =
+  static int ep_switchable[] =
   {
-    EL_BOMB,
-    EL_DYNAMITE_ACTIVE,
-    EL_DYNAMITE,
-    EL_DYNABOMB_PLAYER_1_ACTIVE,
-    EL_DYNABOMB_PLAYER_2_ACTIVE,
-    EL_DYNABOMB_PLAYER_3_ACTIVE,
-    EL_DYNABOMB_PLAYER_4_ACTIVE,
-    EL_DYNABOMB_INCREASE_NUMBER,
-    EL_DYNABOMB_INCREASE_SIZE,
-    EL_DYNABOMB_INCREASE_POWER,
-    EL_SP_DISK_RED_ACTIVE,
-    EL_BUG,
-    EL_MOLE,
-    EL_PENGUIN,
-    EL_PIG,
-    EL_DRAGON,
-    EL_SATELLITE,
-    EL_SP_DISK_RED,
-    EL_SP_DISK_ORANGE,
-    EL_SP_DISK_YELLOW,
-    EL_SP_SNIKSNAK,
-    EL_SP_ELECTRON,
-    EL_DX_SUPABOMB,
+    EL_ROBOT_WHEEL,
+    EL_SP_TERMINAL,
+    EL_CONVEYOR_BELT_1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_1_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_1_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_2_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_2_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_3_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_3_SWITCH_RIGHT,
+    EL_CONVEYOR_BELT_4_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_4_SWITCH_MIDDLE,
+    EL_CONVEYOR_BELT_4_SWITCH_RIGHT,
+    EL_SWITCHGATE_SWITCH_UP,
+    EL_SWITCHGATE_SWITCH_DOWN,
+    EL_LIGHT_SWITCH,
+    EL_LIGHT_SWITCH_ACTIVE,
+    EL_TIMEGATE_SWITCH,
+    EL_BALLOON_SWITCH_LEFT,
+    EL_BALLOON_SWITCH_RIGHT,
+    EL_BALLOON_SWITCH_UP,
+    EL_BALLOON_SWITCH_DOWN,
+    EL_BALLOON_SWITCH_ANY,
+    EL_LAMP,
+    EL_TIME_ORB_FULL,
     -1
   };
 
@@ -1548,7 +1825,7 @@ void InitElementPropertiesStatic()
   {
     EL_EMPTY,
     EL_SAND,
-    EL_WALL_CRUMBLED,
+    EL_WALL_SLIPPERY,
     EL_BD_WALL,
     EL_ROCK,
     EL_BD_ROCK,
@@ -1620,6 +1897,11 @@ void InitElementPropertiesStatic()
     EL_INVISIBLE_WALL,
     /* more than one murphy in a level results in an inactive clone */
     EL_SP_MURPHY_CLONE,
+    /* runtime elements*/
+    EL_SP_DISK_RED_ACTIVE,
+    EL_SP_TERMINAL_ACTIVE,
+    EL_SP_BUGGY_BASE_ACTIVATING,
+    EL_SP_BUGGY_BASE_ACTIVE,
     -1
   };
 
@@ -1637,8 +1919,8 @@ void InitElementPropertiesStatic()
 
   static int ep_gem[] =
   {
-    EL_EMERALD,
     EL_BD_DIAMOND,
+    EL_EMERALD,
     EL_EMERALD_YELLOW,
     EL_EMERALD_RED,
     EL_EMERALD_PURPLE,
@@ -1686,6 +1968,17 @@ void InitElementPropertiesStatic()
     -1
   };
 
+  static int ep_food_pig[] =
+  {
+    EL_EMERALD,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_DIAMOND,
+    -1
+  };
+
   static int ep_historic_wall[] =
   {
     EL_STEELWALL,
@@ -1709,7 +2002,7 @@ void InitElementPropertiesStatic()
     EL_EXIT_OPENING,
     EL_EXIT_OPEN,
     EL_WALL,
-    EL_WALL_CRUMBLED,
+    EL_WALL_SLIPPERY,
     EL_EXPANDABLE_WALL,
     EL_EXPANDABLE_WALL_HORIZONTAL,
     EL_EXPANDABLE_WALL_VERTICAL,
@@ -1740,7 +2033,7 @@ void InitElementPropertiesStatic()
     EL_INVISIBLE_STEELWALL_ACTIVE,
     EL_INVISIBLE_WALL,
     EL_INVISIBLE_WALL_ACTIVE,
-    EL_STEELWALL_SLANTED,
+    EL_STEELWALL_SLIPPERY,
     EL_EMC_STEELWALL_1,
     EL_EMC_STEELWALL_2,
     EL_EMC_STEELWALL_3,
@@ -1764,7 +2057,7 @@ void InitElementPropertiesStatic()
     EL_EXPANDABLE_WALL_VERTICAL,
     EL_EXPANDABLE_WALL_ANY,
     EL_BD_WALL,
-    EL_WALL_CRUMBLED,
+    EL_WALL_SLIPPERY,
     EL_EXIT_CLOSED,
     EL_EXIT_OPENING,
     EL_EXIT_OPEN,
@@ -1867,7 +2160,7 @@ void InitElementPropertiesStatic()
     EL_SIGN_EXIT,
     EL_SIGN_YINYANG,
     EL_SIGN_OTHER,
-    EL_STEELWALL_SLANTED,
+    EL_STEELWALL_SLIPPERY,
     EL_EMC_STEELWALL_1,
     EL_EMC_STEELWALL_2,
     EL_EMC_STEELWALL_3,
@@ -1911,6 +2204,22 @@ void InitElementPropertiesStatic()
     -1
   };
 
+  static int ep_classic_enemy[] =
+  {
+    EL_BUG,
+    EL_SPACESHIP,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
+
+    EL_YAMYAM,
+    EL_DARK_YAMYAM,
+    EL_ROBOT,
+    EL_PACMAN,
+    EL_SP_SNIKSNAK,
+    EL_SP_ELECTRON,
+    -1
+  };
+
   static int ep_belt[] =
   {
     EL_CONVEYOR_BELT_1_LEFT,
@@ -2045,7 +2354,7 @@ void InitElementPropertiesStatic()
     EL_SAND,
     EL_WALL,
     EL_BD_WALL,
-    EL_WALL_CRUMBLED,
+    EL_WALL_SLIPPERY,
     EL_STEELWALL,
     EL_AMOEBA_DEAD,
     EL_QUICKSAND_EMPTY,
@@ -2088,7 +2397,9 @@ void InitElementPropertiesStatic()
     EL_DYNABOMB_INCREASE_NUMBER,
     EL_DYNABOMB_INCREASE_SIZE,
     EL_DYNABOMB_INCREASE_POWER,
+#if 0
     EL_SOKOBAN_OBJECT,
+#endif
     EL_SOKOBAN_FIELD_EMPTY,
     EL_SOKOBAN_FIELD_FULL,
     EL_WALL_EMERALD_RED,
@@ -2118,7 +2429,9 @@ void InitElementPropertiesStatic()
     EL_SP_PORT_VERTICAL,
     EL_SP_PORT_ANY,
     EL_SP_DISK_RED,
+#if 0
     EL_SP_DISK_YELLOW,
+#endif
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
@@ -2159,7 +2472,7 @@ void InitElementPropertiesStatic()
     EL_SIGN_EXIT,
     EL_SIGN_YINYANG,
     EL_SIGN_OTHER,
-    EL_STEELWALL_SLANTED,
+    EL_STEELWALL_SLIPPERY,
     EL_EMC_STEELWALL_1,
     EL_EMC_STEELWALL_2,
     EL_EMC_STEELWALL_3,
@@ -2182,11 +2495,21 @@ void InitElementPropertiesStatic()
   } element_properties[] =
   {
     { ep_diggable,		EP_DIGGABLE		},
-    { ep_collectible,		EP_COLLECTIBLE		},
+    { 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,		EP_CAN_SMASH		},
+    { 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_can_explode_by_fire,	EP_CAN_EXPLODE_BY_FIRE	},
+    { ep_can_explode_smashed,	EP_CAN_EXPLODE_SMASHED	},
+    { ep_can_explode_impact,	EP_CAN_EXPLODE_IMPACT	},
     { ep_walkable_over,		EP_WALKABLE_OVER	},
     { ep_walkable_inside,	EP_WALKABLE_INSIDE	},
     { ep_walkable_under,	EP_WALKABLE_UNDER	},
@@ -2195,22 +2518,21 @@ void InitElementPropertiesStatic()
     { ep_passable_under,	EP_PASSABLE_UNDER	},
     { ep_pushable,		EP_PUSHABLE		},
 
-    { ep_player,		EP_PLAYER		},
     { ep_can_be_crumbled,	EP_CAN_BE_CRUMBLED	},
-    { ep_can_move,		EP_CAN_MOVE		},
-    { ep_can_change,		EP_CAN_CHANGE		},
-    { ep_dont_touch,		EP_DONT_TOUCH		},
-    { ep_enemy,			EP_ENEMY		},
-    { ep_dont_go_to,		EP_DONT_GO_TO		},
-    { ep_explosive,		EP_EXPLOSIVE		},
+
+    { 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		},
@@ -2225,7 +2547,40 @@ void InitElementPropertiesStatic()
     { NULL,			-1			}
   };
 
-  int i, j;
+  static int copy_properties[][5] =
+  {
+    {
+      EL_BUG,
+      EL_BUG_LEFT,		EL_BUG_RIGHT,
+      EL_BUG_UP,		EL_BUG_DOWN
+    },
+    {
+      EL_SPACESHIP,
+      EL_SPACESHIP_LEFT,	EL_SPACESHIP_RIGHT,
+      EL_SPACESHIP_UP,		EL_SPACESHIP_DOWN
+    },
+    {
+      EL_BD_BUTTERFLY,
+      EL_BD_BUTTERFLY_LEFT,	EL_BD_BUTTERFLY_RIGHT,
+      EL_BD_BUTTERFLY_UP,	EL_BD_BUTTERFLY_DOWN
+    },
+    {
+      EL_BD_FIREFLY,
+      EL_BD_FIREFLY_LEFT,	EL_BD_FIREFLY_RIGHT,
+      EL_BD_FIREFLY_UP,		EL_BD_FIREFLY_DOWN
+    },
+    {
+      EL_PACMAN,
+      EL_PACMAN_LEFT,		EL_PACMAN_RIGHT,
+      EL_PACMAN_UP,		EL_PACMAN_DOWN
+    },
+    {
+      -1,
+      -1, -1, -1, -1
+    }
+  };
+
+  int i, j, k;
 
   /* always start with reliable default values (element has no properties) */
   for (i=0; i < MAX_NUM_ELEMENTS; i++)
@@ -2237,6 +2592,13 @@ void InitElementPropertiesStatic()
     for (j=0; (element_properties[i].elements)[j] != -1; j++)
       SET_PROPERTY((element_properties[i].elements)[j],
 		   element_properties[i].property, TRUE);
+
+  /* copy properties to some elements that are only stored in level file */
+  for (i=0; i < NUM_ELEMENT_PROPERTIES; i++)
+    for (j=0; copy_properties[j][0] != -1; j++)
+      if (HAS_PROPERTY(copy_properties[j][0], i))
+	for (k=1; k<=4; k++)
+	  SET_PROPERTY(copy_properties[j][k], i, TRUE);
 }
 
 void InitElementPropertiesEngine(int engine_version)
@@ -2247,16 +2609,16 @@ void InitElementPropertiesEngine(int engine_version)
     EP_AMOEBALIVE,
     EP_AMOEBOID,
     EP_PFORTE,
-    EP_ENEMY,
+    EP_DONT_COLLIDE_WITH,
     EP_MAUER,
     EP_CAN_FALL,
     EP_CAN_SMASH,
-    EP_CAN_CHANGE,
+    EP_CAN_PASS_MAGIC_WALL,
     EP_CAN_MOVE,
     EP_DONT_TOUCH,
-    EP_DONT_GO_TO,
+    EP_DONT_RUN_INTO,
     EP_GEM,
-    EP_EXPLOSIVE,
+    EP_CAN_EXPLODE_BY_FIRE,
     EP_PUSHABLE,
     EP_PLAYER,
     EP_HAS_CONTENT,
@@ -2276,56 +2638,82 @@ void InitElementPropertiesEngine(int engine_version)
 
   static int no_wall_properties[] =
   {
-    EP_AMOEBALIVE,
-    EP_AMOEBOID,
-    EP_CAN_BE_CRUMBLED,
-    EP_ENEMY,
-    EP_CAN_FALL,
-    EP_CAN_SMASH,
+    EP_DIGGABLE,
+    EP_COLLECTIBLE_ONLY,
+    EP_DONT_RUN_INTO,
+    EP_DONT_COLLIDE_WITH,
     EP_CAN_MOVE,
-    EP_DONT_GO_TO,
-    EP_FOOD_DARK_YAMYAM,
-    EP_GEM,
-    EP_FOOD_PENGUIN,
+    EP_CAN_FALL,
+    EP_CAN_SMASH_PLAYER,
+    EP_CAN_SMASH_ENEMIES,
+    EP_CAN_SMASH_EVERYTHING,
     EP_PUSHABLE,
+
+    EP_CAN_BE_CRUMBLED,
+
     EP_PLAYER,
-    EP_ACCESSIBLE,
-    EP_DIGGABLE,
-    EP_COLLECTIBLE,
-    EP_ACTIVE_BOMB,
+    EP_GEM,
+    EP_FOOD_DARK_YAMYAM,
+    EP_FOOD_PENGUIN,
     EP_BELT,
     EP_BELT_ACTIVE,
     EP_TUBE,
+    EP_AMOEBOID,
+    EP_AMOEBALIVE,
+    EP_ACTIVE_BOMB,
+
+    EP_ACCESSIBLE,
     -1
   };
 
   int i, j;
 
-  /* set all special, combined or engine dependant element properties */
+#if 0
+  InitElementPropertiesStatic();
+#endif
+
+  /* set all special, combined or engine dependent element properties */
   for (i=0; i < MAX_NUM_ELEMENTS; i++)
   {
+#if 0
+    for (j=EP_ACCESSIBLE_OVER; j < NUM_ELEMENT_PROPERTIES; j++)
+      SET_PROPERTY(i, j, FALSE);
+#endif
+
     /* ---------- INACTIVE ------------------------------------------------- */
     if (i >= EL_CHAR_START && i <= EL_CHAR_END)
       SET_PROPERTY(i, EP_INACTIVE, TRUE);
 
     /* ---------- WALKABLE, PASSABLE, ACCESSIBLE --------------------------- */
-    if (IS_WALKABLE_OVER(i) || IS_WALKABLE_INSIDE(i) || IS_WALKABLE_UNDER(i))
-      SET_PROPERTY(i, EP_WALKABLE, TRUE);
+    SET_PROPERTY(i, EP_WALKABLE, (IS_WALKABLE_OVER(i) ||
+				  IS_WALKABLE_INSIDE(i) ||
+				  IS_WALKABLE_UNDER(i)));
+
+    SET_PROPERTY(i, EP_PASSABLE, (IS_PASSABLE_OVER(i) ||
+				  IS_PASSABLE_INSIDE(i) ||
+				  IS_PASSABLE_UNDER(i)));
+
+    SET_PROPERTY(i, EP_ACCESSIBLE_OVER, (IS_WALKABLE_OVER(i) ||
+					 IS_PASSABLE_OVER(i)));
 
-    if (IS_PASSABLE_OVER(i) || IS_PASSABLE_INSIDE(i) || IS_PASSABLE_UNDER(i))
-      SET_PROPERTY(i, EP_PASSABLE, TRUE);
+    SET_PROPERTY(i, EP_ACCESSIBLE_INSIDE, (IS_WALKABLE_INSIDE(i) ||
+					   IS_PASSABLE_INSIDE(i)));
 
-    if (IS_WALKABLE_OVER(i) || IS_PASSABLE_OVER(i))
-      SET_PROPERTY(i, EP_ACCESSIBLE_OVER, TRUE);
+    SET_PROPERTY(i, EP_ACCESSIBLE_UNDER, (IS_WALKABLE_UNDER(i) ||
+					  IS_PASSABLE_UNDER(i)));
 
-    if (IS_WALKABLE_INSIDE(i) || IS_PASSABLE_INSIDE(i))
-      SET_PROPERTY(i, EP_ACCESSIBLE_INSIDE, TRUE);
+    SET_PROPERTY(i, EP_ACCESSIBLE, (IS_WALKABLE(i) ||
+				    IS_PASSABLE(i)));
 
-    if (IS_WALKABLE_UNDER(i) || IS_PASSABLE_UNDER(i))
-      SET_PROPERTY(i, EP_ACCESSIBLE_UNDER, TRUE);
+    /* ---------- COLLECTIBLE ---------------------------------------------- */
+    SET_PROPERTY(i, EP_COLLECTIBLE, (IS_COLLECTIBLE_ONLY(i) ||
+				     IS_DROPPABLE(i)));
 
-    if (IS_WALKABLE(i) || IS_PASSABLE(i))
-      SET_PROPERTY(i, EP_ACCESSIBLE, TRUE);
+    /* ---------- SNAPPABLE ------------------------------------------------ */
+    SET_PROPERTY(i, EP_SNAPPABLE, (IS_DIGGABLE(i) ||
+				   IS_COLLECTIBLE(i) ||
+				   IS_SWITCHABLE(i) ||
+				   i == EL_BD_ROCK));
 
     /* ---------- WALL ----------------------------------------------------- */
     SET_PROPERTY(i, EP_WALL, TRUE);	/* default: element is wall */
@@ -2347,9 +2735,12 @@ void InitElementPropertiesEngine(int engine_version)
 					     !IS_COLLECTIBLE(i)));
 
     /* ---------- DRAGONFIRE_PROOF ----------------------------------------- */
-    if (IS_HISTORIC_SOLID(i) || i == EL_EXPLOSION ||
-	(IS_CUSTOM_ELEMENT(i) && IS_INDESTRUCTIBLE(i)))
+
+    if (IS_HISTORIC_SOLID(i) || i == EL_EXPLOSION)
       SET_PROPERTY(i, EP_DRAGONFIRE_PROOF, TRUE);
+    else
+      SET_PROPERTY(i, EP_DRAGONFIRE_PROOF, (IS_CUSTOM_ELEMENT(i) &&
+					    IS_INDESTRUCTIBLE(i)));
 
     /* ---------- EXPLOSION_PROOF ------------------------------------------ */
     if (i == EL_FLAMES)
@@ -2360,6 +2751,42 @@ void InitElementPropertiesEngine(int engine_version)
       SET_PROPERTY(i, EP_EXPLOSION_PROOF, (IS_INDESTRUCTIBLE(i) &&
 					   !IS_WALKABLE_OVER(i) &&
 					   !IS_WALKABLE_UNDER(i)));
+
+    if (IS_CUSTOM_ELEMENT(i))
+    {
+      /* ---------- DONT_COLLIDE_WITH / DONT_RUN_INTO ---------------------- */
+      if (DONT_TOUCH(i))
+	SET_PROPERTY(i, EP_DONT_COLLIDE_WITH, TRUE);
+      if (DONT_COLLIDE_WITH(i))
+	SET_PROPERTY(i, EP_DONT_RUN_INTO, TRUE);
+
+      /* ---------- CAN_SMASH_ENEMIES / CAN_SMASH_PLAYER ------------------- */
+      if (CAN_SMASH_EVERYTHING(i))
+	SET_PROPERTY(i, EP_CAN_SMASH_ENEMIES, TRUE);
+      if (CAN_SMASH_ENEMIES(i))
+	SET_PROPERTY(i, EP_CAN_SMASH_PLAYER, TRUE);
+    }
+
+    /* ---------- CAN_SMASH ------------------------------------------------ */
+    SET_PROPERTY(i, EP_CAN_SMASH, (CAN_SMASH_PLAYER(i) ||
+				   CAN_SMASH_ENEMIES(i) ||
+				   CAN_SMASH_EVERYTHING(i)));
+
+    /* ---------- CAN_EXPLODE ---------------------------------------------- */
+    SET_PROPERTY(i, EP_CAN_EXPLODE, (CAN_EXPLODE_BY_FIRE(i) ||
+				     CAN_EXPLODE_SMASHED(i) ||
+				     CAN_EXPLODE_IMPACT(i)));
+
+    /* ---------- CAN_BE_CRUMBLED ------------------------------------------ */
+    SET_PROPERTY(i, EP_CAN_BE_CRUMBLED,
+		 element_info[i].crumbled[ACTION_DEFAULT] != IMG_EMPTY);
+
+#if 0
+    if (CAN_BE_CRUMBLED(i))
+      printf("::: '%s' can be crumbled [%d]\n",
+	     element_info[i].token_name,
+	     element_info[i].crumbled[ACTION_DEFAULT]);
+#endif
   }
 
 #if 0
@@ -2404,6 +2831,22 @@ void InitElementPropertiesEngine(int engine_version)
 		 (level.em_slippery_gems &&
 		  engine_version > VERSION_IDENT(2,0,1)));
   }
+
+#if 0
+  /* dynamically adjust element properties according to game engine version */
+#if 0
+  if (engine_version < RELEASE_IDENT(2,2,0,7))
+#endif
+  {
+    for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+    {
+      int element = EL_CUSTOM_START + i;
+
+      element_info[element].push_delay_fixed = 2;
+      element_info[element].push_delay_random = 8;
+    }
+  }
+#endif
 }
 
 static void InitGlobal()
@@ -2472,7 +2915,7 @@ void Execute_Command(char *command)
     if (access(filename, F_OK) != 0)
       Error(ERR_EXIT, "cannot open file '%s'", filename);
 
-    LoadLevelFromFilename(filename);
+    LoadLevelFromFilename(&level, filename);
     DumpLevel(&level);
 
     exit(0);
@@ -2537,6 +2980,16 @@ static void InitArtworkInfo()
   LoadArtworkInfo();
 }
 
+static char *get_string_in_brackets(char *string)
+{
+  char *string_in_brackets = checked_malloc(strlen(string) + 3);
+
+  sprintf(string_in_brackets, "[%s]", string);
+
+  return string_in_brackets;
+}
+
+#if 0
 static char *get_element_class_token(int element)
 {
   char *element_class_name = element_info[element].class_name;
@@ -2547,10 +3000,21 @@ static char *get_element_class_token(int element)
   return element_class_token;
 }
 
+static char *get_action_class_token(int action)
+{
+  char *action_class_name = &element_action_info[action].suffix[1];
+  char *action_class_token = checked_malloc(strlen(action_class_name) + 3);
+
+  sprintf(action_class_token, "[%s]", action_class_name);
+
+  return action_class_token;
+}
+#endif
+
 static void InitArtworkConfig()
 {
   static char *image_id_prefix[MAX_NUM_ELEMENTS + NUM_FONTS + 1];
-  static char *sound_id_prefix[MAX_NUM_ELEMENTS + MAX_NUM_ELEMENTS + 1];
+  static char *sound_id_prefix[2 * MAX_NUM_ELEMENTS + 1];
   static char *action_id_suffix[NUM_ACTIONS + 1];
   static char *direction_id_suffix[NUM_DIRECTIONS + 1];
   static char *special_id_suffix[NUM_SPECIAL_GFX_ARGS + 1];
@@ -2601,8 +3065,9 @@ static void InitArtworkConfig()
   for (i=0; i<MAX_NUM_ELEMENTS; i++)
     sound_id_prefix[i] = element_info[i].token_name;
   for (i=0; i<MAX_NUM_ELEMENTS; i++)
-    sound_id_prefix[MAX_NUM_ELEMENTS + i] = get_element_class_token(i);
-  sound_id_prefix[MAX_NUM_ELEMENTS + MAX_NUM_ELEMENTS] = NULL;
+    sound_id_prefix[MAX_NUM_ELEMENTS + i] =
+      get_string_in_brackets(element_info[i].class_name);
+  sound_id_prefix[2 * MAX_NUM_ELEMENTS] = NULL;
 
   for (i=0; i<NUM_ACTIONS; i++)
     action_id_suffix[i] = element_action_info[i].suffix;
@@ -2734,6 +3199,17 @@ void InitLevelArtworkInfo()
 
 static void InitImages()
 {
+  setLevelArtworkDir(artwork.gfx_first);
+
+#if 0
+  printf("::: InitImages for '%s' ['%s', '%s'] ['%s', '%s']\n",
+	 leveldir_current->identifier,
+	 artwork.gfx_current_identifier,
+	 artwork.gfx_current->identifier,
+	 leveldir_current->graphics_set,
+	 leveldir_current->graphics_path);
+#endif
+
   ReloadCustomImages();
 
   LoadCustomElementDescriptions();
@@ -2742,15 +3218,27 @@ static void InitImages()
   ReinitializeGraphics();
 }
 
-static void InitSound()
+static void InitSound(char *identifier)
 {
-  InitReloadCustomSounds(artwork.snd_current->identifier);
+  if (identifier == NULL)
+    identifier = artwork.snd_current->identifier;
+
+  /* set artwork path to send it to the sound server process */
+  setLevelArtworkDir(artwork.snd_first);
+
+  InitReloadCustomSounds(identifier);
   ReinitializeSounds();
 }
 
-static void InitMusic()
+static void InitMusic(char *identifier)
 {
-  InitReloadCustomMusic(artwork.mus_current->identifier);
+  if (identifier == NULL)
+    identifier = artwork.mus_current->identifier;
+
+  /* set artwork path to send it to the sound server process */
+  setLevelArtworkDir(artwork.mus_first);
+
+  InitReloadCustomMusic(identifier);
   ReinitializeMusic();
 }
 
@@ -2777,83 +3265,100 @@ void InitNetworkServer()
 #endif
 }
 
-void ReloadCustomArtwork()
+static char *getNewArtworkIdentifier(int type)
 {
-  static char *leveldir_current_identifier = NULL;
-  static boolean last_override_level_graphics = FALSE;
-  static boolean last_override_level_sounds = FALSE;
-  static boolean last_override_level_music = FALSE;
-  /* identifier for new artwork; default: artwork configured in setup */
-  char *gfx_new_identifier = artwork.gfx_current->identifier;
-  char *snd_new_identifier = artwork.snd_current->identifier;
-  char *mus_new_identifier = artwork.mus_current->identifier;
-  boolean redraw_screen = FALSE;
+  static char *leveldir_current_identifier[3] = { NULL, NULL, NULL };
+  static boolean last_override_level_artwork[3] = { FALSE, FALSE, FALSE };
+  static boolean last_has_level_artwork_set[3] = { FALSE, FALSE, FALSE };
+  static boolean initialized[3] = { FALSE, FALSE, FALSE };
+  TreeInfo *artwork_first_node = ARTWORK_FIRST_NODE(artwork, type);
+  boolean setup_override_artwork = SETUP_OVERRIDE_ARTWORK(setup, type);
+  char *setup_artwork_set = SETUP_ARTWORK_SET(setup, type);
+  char *leveldir_identifier = leveldir_current->identifier;
+  char *leveldir_artwork_set = LEVELDIR_ARTWORK_SET(leveldir_current, type);
+  boolean has_level_artwork_set = (leveldir_artwork_set != NULL);
+  char *artwork_current_identifier;
+  char *artwork_new_identifier = NULL;	/* default: nothing has changed */
 
-  if (leveldir_current_identifier == NULL)
-    leveldir_current_identifier = leveldir_current->identifier;
+  /* leveldir_current may be invalid (level group, parent link) */
+  if (!validLevelSeries(leveldir_current))
+    return NULL;
+
+
+  /* 1st step: determine artwork set to be activated in descending order:
+     --------------------------------------------------------------------
+     1. setup artwork (when configured to override everything else)
+     2. artwork set configured in "levelinfo.conf" of current level set
+        (artwork in level directory will have priority when loading later)
+     3. artwork in level directory (stored in artwork sub-directory)
+     4. setup artwork (currently configured in setup menu) */
+
+  if (setup_override_artwork)
+    artwork_current_identifier = setup_artwork_set;
+  else if (leveldir_artwork_set != NULL)
+    artwork_current_identifier = leveldir_artwork_set;
+  else if (getTreeInfoFromIdentifier(artwork_first_node, leveldir_identifier))
+    artwork_current_identifier = leveldir_identifier;
+  else
+    artwork_current_identifier = setup_artwork_set;
 
-#if 0
-  printf("CURRENT GFX: '%s' ['%s']\n", artwork.gfx_current->identifier,
-	 leveldir_current->graphics_set);
-  printf("CURRENT LEV: '%s' / '%s'\n", leveldir_current_identifier,
-	 leveldir_current->identifier);
-#endif
 
-#if 0
-  printf("graphics --> '%s' ('%s')\n",
-	 artwork.gfx_current_identifier, artwork.gfx_current->filename);
-  printf("sounds   --> '%s' ('%s')\n",
-	 artwork.snd_current_identifier, artwork.snd_current->filename);
-  printf("music    --> '%s' ('%s')\n",
-	 artwork.mus_current_identifier, artwork.mus_current->filename);
-#endif
+  /* 2nd step: check if it is really needed to reload artwork set
+     ------------------------------------------------------------ */
 
-  /* leveldir_current may be invalid (level group, parent link) */
-  if (!validLevelSeries(leveldir_current))
-    return;
+  /* ---------- reload if level set and also artwork set has changed ------- */
+  if (leveldir_current_identifier[type] != leveldir_identifier &&
+      (last_has_level_artwork_set[type] || has_level_artwork_set))
+    artwork_new_identifier = artwork_current_identifier;
 
-  /* when a new level series was selected, check if there was a change
-     in custom artwork stored in level series directory */
-  if (leveldir_current_identifier != leveldir_current->identifier)
-  {
-    char *identifier_old = leveldir_current_identifier;
-    char *identifier_new = leveldir_current->identifier;
+  leveldir_current_identifier[type] = leveldir_identifier;
+  last_has_level_artwork_set[type] = has_level_artwork_set;
 
-    if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_old) !=
-	getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new))
-      gfx_new_identifier = identifier_new;
-    if (getTreeInfoFromIdentifier(artwork.snd_first, identifier_old) !=
-	getTreeInfoFromIdentifier(artwork.snd_first, identifier_new))
-      snd_new_identifier = identifier_new;
-    if (getTreeInfoFromIdentifier(artwork.mus_first, identifier_new) !=
-	getTreeInfoFromIdentifier(artwork.mus_first, identifier_new))
-      mus_new_identifier = identifier_new;
+  /* ---------- reload if "override artwork" setting has changed ----------- */
+  if (last_override_level_artwork[type] != setup_override_artwork)
+    artwork_new_identifier = artwork_current_identifier;
 
-    leveldir_current_identifier = leveldir_current->identifier;
-  }
+  last_override_level_artwork[type] = setup_override_artwork;
+
+  /* ---------- reload if current artwork identifier has changed ----------- */
+  if (strcmp(ARTWORK_CURRENT_IDENTIFIER(artwork, type),
+	     artwork_current_identifier) != 0)
+    artwork_new_identifier = artwork_current_identifier;
+
+  *(&(ARTWORK_CURRENT_IDENTIFIER(artwork, type))) = artwork_current_identifier;
+
+  /* ---------- do not reload directly after starting ---------------------- */
+  if (!initialized[type])
+    artwork_new_identifier = NULL;
+
+  initialized[type] = TRUE;
+
+#if 0
+  printf("CHECKING OLD/NEW GFX:\n- OLD: %s\n- NEW: %s ['%s', '%s'] ['%s']\n",
+	 artwork.gfx_current_identifier, artwork_current_identifier,
+	 artwork.gfx_current->identifier, leveldir_current->graphics_set,
+	 artwork_new_identifier);
+#endif
+
+  return artwork_new_identifier;
+}
 
-  /* custom level artwork configured in level series configuration file
-     always overrides custom level artwork stored in level series directory
-     and (level independant) custom artwork configured in setup menue */
-  if (leveldir_current->graphics_set != NULL)
-    gfx_new_identifier = leveldir_current->graphics_set;
-  if (leveldir_current->sounds_set != NULL)
-    snd_new_identifier = leveldir_current->sounds_set;
-  if (leveldir_current->music_set != NULL)
-    mus_new_identifier = leveldir_current->music_set;
+void ReloadCustomArtwork()
+{
+  char *gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
+  char *snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
+  char *mus_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_MUSIC);
+  boolean redraw_screen = FALSE;
 
-  if (strcmp(artwork.gfx_current_identifier, gfx_new_identifier) != 0 ||
-      last_override_level_graphics != setup.override_level_graphics)
+  if (gfx_new_identifier != NULL)
   {
 #if 0
-    printf("RELOADING GRAPHICS '%s' -> '%s' ('%s')\n",
+    printf("RELOADING GRAPHICS '%s' -> '%s' ['%s']\n",
 	   artwork.gfx_current_identifier,
-	   artwork.gfx_current->identifier,
-	   gfx_new_identifier);
+	   gfx_new_identifier,
+	   artwork.gfx_current->identifier);
 #endif
 
-    setLevelArtworkDir(artwork.gfx_first);
-
     ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
     InitImages();
@@ -2861,45 +3366,23 @@ void ReloadCustomArtwork()
     FreeTileClipmasks();
     InitTileClipmasks();
 
-    artwork.gfx_current_identifier = artwork.gfx_current->identifier;
-    last_override_level_graphics = setup.override_level_graphics;
-
     redraw_screen = TRUE;
   }
 
-  if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 ||
-      last_override_level_sounds != setup.override_level_sounds)
+  if (snd_new_identifier != NULL)
   {
-#if 0
-    printf("RELOADING SOUNDS '%s' -> '%s' ('%s')\n",
-	   artwork.snd_current_identifier,
-	   artwork.snd_current->identifier,
-	   snd_new_identifier);
-#endif
-
-    /* set artwork path to send it to the sound server process */
-    setLevelArtworkDir(artwork.snd_first);
-
-    InitReloadCustomSounds(snd_new_identifier);
-    ReinitializeSounds();
+    ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
-    artwork.snd_current_identifier = artwork.snd_current->identifier;
-    last_override_level_sounds = setup.override_level_sounds;
+    InitSound(snd_new_identifier);
 
     redraw_screen = TRUE;
   }
 
-  if (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 ||
-      last_override_level_music != setup.override_level_music)
+  if (mus_new_identifier != NULL)
   {
-    /* set artwork path to send it to the sound server process */
-    setLevelArtworkDir(artwork.mus_first);
-
-    InitReloadCustomMusic(mus_new_identifier);
-    ReinitializeMusic();
+    ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
-    artwork.mus_current_identifier = artwork.mus_current->identifier;
-    last_override_level_music = setup.override_level_music;
+    InitMusic(mus_new_identifier);
 
     redraw_screen = TRUE;
   }
@@ -2914,6 +3397,12 @@ void ReloadCustomArtwork()
   }
 }
 
+void KeyboardAutoRepeatOffUnlessAutoplay()
+{
+  if (global.autoplay_leveldir == NULL)
+    KeyboardAutoRepeatOff();
+}
+
 
 /* ========================================================================= */
 /* OpenAll()                                                                 */
@@ -2964,8 +3453,8 @@ void OpenAll()
   InitLevelArtworkInfo();
 
   InitImages();			/* needs to know current level directory */
-  InitSound();			/* needs to know current level directory */
-  InitMusic();			/* needs to know current level directory */
+  InitSound(NULL);		/* needs to know current level directory */
+  InitMusic(NULL);		/* needs to know current level directory */
 
   InitGfxBackground();
 
@@ -2993,7 +3482,7 @@ void CloseAllAndExit(int exit_value)
   FreeTileClipmasks();
 
   CloseVideoDisplay();
-  ClosePlatformDependantStuff();
+  ClosePlatformDependentStuff();
 
   exit(exit_value);
 }