X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=5015dc9842b06818fff102f28031c05a90556f79;hb=f857fec3082c785b0dd271b6ad1b7642a2ed4e65;hp=d327a93d4895c21076fe1fe00e0b23bb8af1aa08;hpb=9073d88279c0b9c5be103a6bb4d5c608ab0d90cc;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index d327a93d..5015dc98 100644
--- a/src/init.c
+++ b/src/init.c
@@ -481,9 +481,9 @@ void InitElementGraphicInfo()
 
     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);
 
       for (dir=0; dir<NUM_DIRECTIONS; dir++)
       {
@@ -492,7 +492,7 @@ void InitElementGraphicInfo()
 	/* 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]);
+	    (act_remove ? IMG_EMPTY : default_action_direction_graphic[dir]);
 
 	if (element_info[i].direction_graphic[act][dir] == -1)
 	  element_info[i].direction_graphic[act][dir] =
@@ -502,7 +502,7 @@ void InitElementGraphicInfo()
       /* 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);
     }
   }
 
@@ -1070,207 +1070,53 @@ static void ReinitializeMusic()
 
 void InitElementPropertiesStatic()
 {
-  static int ep_amoebalive[] =
-  {
-    EL_AMOEBA_WET,
-    EL_AMOEBA_DRY,
-    EL_AMOEBA_FULL,
-    EL_BD_AMOEBA,
-    -1
-  };
-
-  static int ep_amoeboid[] =
-  {
-    EL_AMOEBA_DEAD,
-    EL_AMOEBA_WET,
-    EL_AMOEBA_DRY,
-    EL_AMOEBA_FULL,
-    EL_BD_AMOEBA,
-    -1
-  };
-
-  static int ep_keygate[] =
-  {
-    EL_GATE_1,
-    EL_GATE_2,
-    EL_GATE_3,
-    EL_GATE_4,
-    EL_GATE_1_GRAY,
-    EL_GATE_2_GRAY,
-    EL_GATE_3_GRAY,
-    EL_GATE_4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1_GRAY,
-    EL_EM_GATE_2_GRAY,
-    EL_EM_GATE_3_GRAY,
-    EL_EM_GATE_4_GRAY,
-    -1
-  };
-
-  static int ep_can_be_crumbled[] =
+  static int ep_diggable[] =
   {
     EL_SAND,
-    EL_LANDMINE,
+    EL_SP_BASE,
+    EL_SP_BUGGY_BASE,
+    EL_SP_BUGGY_BASE_ACTIVATING,
     EL_TRAP,
+    EL_INVISIBLE_SAND,
+    EL_INVISIBLE_SAND_ACTIVE,
+#if 1
+    EL_LANDMINE,
     EL_TRAP_ACTIVE,
+    EL_SP_BUGGY_BASE_ACTIVE,
+#endif
     -1
   };
 
-  static int ep_historic_solid[] =
+  static int ep_collectible[] =
   {
-    EL_WALL,
-    EL_EXPANDABLE_WALL,
-    EL_EXPANDABLE_WALL_HORIZONTAL,
-    EL_EXPANDABLE_WALL_VERTICAL,
-    EL_EXPANDABLE_WALL_ANY,
-    EL_BD_WALL,
-    EL_WALL_CRUMBLED,
-    EL_EXIT_CLOSED,
-    EL_EXIT_OPENING,
-    EL_EXIT_OPEN,
-    EL_AMOEBA_DEAD,
-    EL_AMOEBA_WET,
-    EL_AMOEBA_DRY,
-    EL_AMOEBA_FULL,
-    EL_BD_AMOEBA,
-    EL_QUICKSAND_EMPTY,
-    EL_QUICKSAND_FULL,
-    EL_QUICKSAND_FILLING,
-    EL_QUICKSAND_EMPTYING,
-    EL_MAGIC_WALL,
-    EL_MAGIC_WALL_ACTIVE,
-    EL_MAGIC_WALL_EMPTYING,
-    EL_MAGIC_WALL_FILLING,
-    EL_MAGIC_WALL_FULL,
-    EL_MAGIC_WALL_DEAD,
-    EL_BD_MAGIC_WALL,
-    EL_BD_MAGIC_WALL_ACTIVE,
-    EL_BD_MAGIC_WALL_EMPTYING,
-    EL_BD_MAGIC_WALL_FULL,
-    EL_BD_MAGIC_WALL_FILLING,
-    EL_BD_MAGIC_WALL_DEAD,
-    EL_GAME_OF_LIFE,
-    EL_BIOMAZE,
-    EL_SP_CHIP_SINGLE,
-    EL_SP_CHIP_LEFT,
-    EL_SP_CHIP_RIGHT,
-    EL_SP_CHIP_TOP,
-    EL_SP_CHIP_BOTTOM,
-    EL_SP_TERMINAL,
-    EL_SP_TERMINAL_ACTIVE,
-    EL_SP_EXIT_CLOSED,
-    EL_SP_EXIT_OPEN,
-    EL_INVISIBLE_WALL,
-    EL_INVISIBLE_WALL_ACTIVE,
-    EL_SWITCHGATE_SWITCH_UP,
-    EL_SWITCHGATE_SWITCH_DOWN,
-    EL_TIMEGATE_SWITCH,
-    EL_TIMEGATE_SWITCH_ACTIVE,
-    EL_EMC_WALL_1,
-    EL_EMC_WALL_2,
-    EL_EMC_WALL_3,
-    EL_EMC_WALL_4,
-    EL_EMC_WALL_5,
-    EL_EMC_WALL_6,
-    EL_EMC_WALL_7,
-    EL_EMC_WALL_8,
-    EL_WALL_PEARL,
-    EL_WALL_CRYSTAL,
-
-    /* the following elements are a direct copy of "indestructible" elements,
-       except "EL_ACID", which is "indestructible", but not "solid"! */
-#if 0
-    EL_ACID,
-#endif
-    EL_STEELWALL,
-    EL_ACID_POOL_TOPLEFT,
-    EL_ACID_POOL_TOPRIGHT,
-    EL_ACID_POOL_BOTTOMLEFT,
-    EL_ACID_POOL_BOTTOM,
-    EL_ACID_POOL_BOTTOMRIGHT,
-    EL_SP_HARDWARE_GRAY,
-    EL_SP_HARDWARE_GREEN,
-    EL_SP_HARDWARE_BLUE,
-    EL_SP_HARDWARE_RED,
-    EL_SP_HARDWARE_YELLOW,
-    EL_SP_HARDWARE_BASE_1,
-    EL_SP_HARDWARE_BASE_2,
-    EL_SP_HARDWARE_BASE_3,
-    EL_SP_HARDWARE_BASE_4,
-    EL_SP_HARDWARE_BASE_5,
-    EL_SP_HARDWARE_BASE_6,
-    EL_INVISIBLE_STEELWALL,
-    EL_INVISIBLE_STEELWALL_ACTIVE,
-    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_LIGHT_SWITCH,
-    EL_LIGHT_SWITCH_ACTIVE,
-    EL_SIGN_EXCLAMATION,
-    EL_SIGN_RADIOACTIVITY,
-    EL_SIGN_STOP,
-    EL_SIGN_WHEELCHAIR,
-    EL_SIGN_PARKING,
-    EL_SIGN_ONEWAY,
-    EL_SIGN_HEART,
-    EL_SIGN_TRIANGLE,
-    EL_SIGN_ROUND,
-    EL_SIGN_EXIT,
-    EL_SIGN_YINYANG,
-    EL_SIGN_OTHER,
-    EL_STEELWALL_SLANTED,
-    EL_EMC_STEELWALL_1,
-    EL_EMC_STEELWALL_2,
-    EL_EMC_STEELWALL_3,
-    EL_EMC_STEELWALL_4,
+    EL_BD_DIAMOND,
+    EL_EMERALD,
+    EL_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_KEY_1,
+    EL_KEY_2,
+    EL_KEY_3,
+    EL_KEY_4,
+    EL_EM_KEY_1,
+    EL_EM_KEY_2,
+    EL_EM_KEY_3,
+    EL_EM_KEY_4,
+    EL_DYNAMITE,
+    EL_DYNABOMB_INCREASE_NUMBER,
+    EL_DYNABOMB_INCREASE_SIZE,
+    EL_DYNABOMB_INCREASE_POWER,
+    EL_SP_INFOTRON,
+    EL_SP_DISK_RED,
+    EL_PEARL,
     EL_CRYSTAL,
-    EL_GATE_1,
-    EL_GATE_2,
-    EL_GATE_3,
-    EL_GATE_4,
-    EL_GATE_1_GRAY,
-    EL_GATE_2_GRAY,
-    EL_GATE_3_GRAY,
-    EL_GATE_4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1_GRAY,
-    EL_EM_GATE_2_GRAY,
-    EL_EM_GATE_3_GRAY,
-    EL_EM_GATE_4_GRAY,
-    EL_SWITCHGATE_OPEN,
-    EL_SWITCHGATE_OPENING,
-    EL_SWITCHGATE_CLOSED,
-    EL_SWITCHGATE_CLOSING,
-    EL_TIMEGATE_OPEN,
-    EL_TIMEGATE_OPENING,
-    EL_TIMEGATE_CLOSED,
-    EL_TIMEGATE_CLOSING,
-    EL_TUBE_ANY,
-    EL_TUBE_VERTICAL,
-    EL_TUBE_HORIZONTAL,
-    EL_TUBE_VERTICAL_LEFT,
-    EL_TUBE_VERTICAL_RIGHT,
-    EL_TUBE_HORIZONTAL_UP,
-    EL_TUBE_HORIZONTAL_DOWN,
-    EL_TUBE_LEFT_UP,
-    EL_TUBE_LEFT_DOWN,
-    EL_TUBE_RIGHT_UP,
-    EL_TUBE_RIGHT_DOWN,
+    EL_KEY_WHITE,
+    EL_SHIELD_NORMAL,
+    EL_SHIELD_DEADLY,
+    EL_EXTRA_TIME,
+    EL_ENVELOPE,
+    EL_SPEED_PILL,
     -1
   };
 
@@ -1403,92 +1249,7 @@ void InitElementPropertiesStatic()
     -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_historic_wall[] =
-  {
-    EL_STEELWALL,
-    EL_GATE_1,
-    EL_GATE_2,
-    EL_GATE_3,
-    EL_GATE_4,
-    EL_GATE_1_GRAY,
-    EL_GATE_2_GRAY,
-    EL_GATE_3_GRAY,
-    EL_GATE_4_GRAY,
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1_GRAY,
-    EL_EM_GATE_2_GRAY,
-    EL_EM_GATE_3_GRAY,
-    EL_EM_GATE_4_GRAY,
-    EL_EXIT_CLOSED,
-    EL_EXIT_OPENING,
-    EL_EXIT_OPEN,
-    EL_WALL,
-    EL_WALL_CRUMBLED,
-    EL_EXPANDABLE_WALL,
-    EL_EXPANDABLE_WALL_HORIZONTAL,
-    EL_EXPANDABLE_WALL_VERTICAL,
-    EL_EXPANDABLE_WALL_ANY,
-    EL_EXPANDABLE_WALL_GROWING,
-    EL_BD_WALL,
-    EL_SP_CHIP_SINGLE,
-    EL_SP_CHIP_LEFT,
-    EL_SP_CHIP_RIGHT,
-    EL_SP_CHIP_TOP,
-    EL_SP_CHIP_BOTTOM,
-    EL_SP_HARDWARE_GRAY,
-    EL_SP_HARDWARE_GREEN,
-    EL_SP_HARDWARE_BLUE,
-    EL_SP_HARDWARE_RED,
-    EL_SP_HARDWARE_YELLOW,
-    EL_SP_HARDWARE_BASE_1,
-    EL_SP_HARDWARE_BASE_2,
-    EL_SP_HARDWARE_BASE_3,
-    EL_SP_HARDWARE_BASE_4,
-    EL_SP_HARDWARE_BASE_5,
-    EL_SP_HARDWARE_BASE_6,
-    EL_SP_TERMINAL,
-    EL_SP_TERMINAL_ACTIVE,
-    EL_SP_EXIT_CLOSED,
-    EL_SP_EXIT_OPEN,
-    EL_INVISIBLE_STEELWALL,
-    EL_INVISIBLE_STEELWALL_ACTIVE,
-    EL_INVISIBLE_WALL,
-    EL_INVISIBLE_WALL_ACTIVE,
-    EL_STEELWALL_SLANTED,
-    EL_EMC_STEELWALL_1,
-    EL_EMC_STEELWALL_2,
-    EL_EMC_STEELWALL_3,
-    EL_EMC_STEELWALL_4,
-    EL_EMC_WALL_1,
-    EL_EMC_WALL_2,
-    EL_EMC_WALL_3,
-    EL_EMC_WALL_4,
-    EL_EMC_WALL_5,
-    EL_EMC_WALL_6,
-    EL_EMC_WALL_7,
-    EL_EMC_WALL_8,
-    -1
-  };
-
-  static int ep_can_fall[] =
+  static int ep_can_fall[] =
   {
     EL_ROCK,
     EL_BD_ROCK,
@@ -1541,43 +1302,121 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_can_change[] =
+  static int ep_walkable_over[] =
   {
-    EL_ROCK,
-    EL_BD_ROCK,
-    EL_EMERALD,
-    EL_BD_DIAMOND,
-    EL_EMERALD_YELLOW,
-    EL_EMERALD_RED,
-    EL_EMERALD_PURPLE,
-    EL_DIAMOND,
+    EL_EMPTY_SPACE,
+    EL_SP_EMPTY_SPACE,
+    EL_SOKOBAN_FIELD_EMPTY,
+    EL_EXIT_OPEN,
+    EL_SP_EXIT_OPEN,
+    EL_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
     -1
   };
 
-  static int ep_can_move[] =
+  static int ep_walkable_inside[] =
   {
-    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_TUBE_ANY,
+    EL_TUBE_VERTICAL,
+    EL_TUBE_HORIZONTAL,
+    EL_TUBE_VERTICAL_LEFT,
+    EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_HORIZONTAL_DOWN,
+    EL_TUBE_LEFT_UP,
+    EL_TUBE_LEFT_DOWN,
+    EL_TUBE_RIGHT_UP,
+    EL_TUBE_RIGHT_DOWN,
+    -1
+  };
+
+  static int ep_walkable_under[] =
+  {
+    -1
+  };
+
+  static int ep_passable_over[] =
+  {
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
+    EL_SWITCHGATE_OPEN,
+    EL_TIMEGATE_OPEN,
+    -1
+  };
+
+  static int ep_passable_inside[] =
+  {
+    EL_SP_PORT_LEFT,
+    EL_SP_PORT_RIGHT,
+    EL_SP_PORT_UP,
+    EL_SP_PORT_DOWN,
+    EL_SP_PORT_HORIZONTAL,
+    EL_SP_PORT_VERTICAL,
+    EL_SP_PORT_ANY,
+    EL_SP_GRAVITY_PORT_LEFT,
+    EL_SP_GRAVITY_PORT_RIGHT,
+    EL_SP_GRAVITY_PORT_UP,
+    EL_SP_GRAVITY_PORT_DOWN,
+    -1
+  };
+
+  static int ep_passable_under[] =
+  {
+    -1
+  };
+
+  static int ep_pushable[] =
+  {
+    EL_ROCK,
+    EL_BD_ROCK,
+    EL_BOMB,
+    EL_NUT,
+    EL_TIME_ORB_EMPTY,
+    EL_SOKOBAN_FIELD_FULL,
+    EL_SOKOBAN_OBJECT,
     EL_SATELLITE,
-    EL_SP_SNIKSNAK,
-    EL_SP_ELECTRON,
+    EL_SP_ZONK,
+    EL_SP_DISK_ORANGE,
+    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
   };
 
-  static int ep_could_move[] =
+  static int ep_can_be_crumbled[] =
+  {
+    EL_SAND,
+    EL_LANDMINE,
+    EL_TRAP,
+    EL_TRAP_ACTIVE,
+    -1
+  };
+
+  static int ep_can_move[] =
   {
+    /* only stored in level file */
     EL_BUG_RIGHT,
     EL_BUG_UP,
     EL_BUG_LEFT,
@@ -1598,6 +1437,38 @@ void InitElementPropertiesStatic()
     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,
+    -1
+  };
+
+  static int ep_can_pass_magic_wall[] =
+  {
+    EL_ROCK,
+    EL_BD_ROCK,
+    EL_EMERALD,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_DIAMOND,
     -1
   };
 
@@ -1610,7 +1481,7 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_dont_go_to[] =
+  static int ep_enemy[] =
   {
     EL_BUG,
     EL_SPACESHIP,
@@ -1620,54 +1491,70 @@ void InitElementPropertiesStatic()
     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_food_dark_yamyam[] =
+  static int ep_dont_go_to[] =
   {
-    EL_SAND,
     EL_BUG,
     EL_SPACESHIP,
     EL_BD_BUTTERFLY,
     EL_BD_FIREFLY,
     EL_YAMYAM,
+    EL_DARK_YAMYAM,
     EL_ROBOT,
     EL_PACMAN,
     EL_AMOEBA_DROP,
-    EL_AMOEBA_DEAD,
-    EL_AMOEBA_WET,
-    EL_AMOEBA_DRY,
-    EL_AMOEBA_FULL,
-    EL_BD_AMOEBA,
-    EL_EMERALD,
-    EL_BD_DIAMOND,
-    EL_EMERALD_YELLOW,
-    EL_EMERALD_RED,
-    EL_EMERALD_PURPLE,
-    EL_DIAMOND,
-    EL_PEARL,
-    EL_CRYSTAL,
+    EL_ACID,
+    EL_SP_SNIKSNAK,
+    EL_SP_ELECTRON,
+    EL_SP_BUGGY_BASE_ACTIVE,
+    EL_TRAP_ACTIVE,
+    EL_LANDMINE,
     -1
   };
 
-  static int ep_bd_element[] =
+  static int ep_can_explode[] =
   {
-    EL_EMPTY,
-    EL_SAND,
-    EL_WALL_CRUMBLED,
-    EL_BD_WALL,
-    EL_ROCK,
-    EL_BD_ROCK,
-    EL_BD_DIAMOND,
-    EL_BD_MAGIC_WALL,
-    EL_EXIT_CLOSED,
+    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,
+    -1
+  };
+
+  static int ep_bd_element[] =
+  {
+    EL_EMPTY,
+    EL_SAND,
+    EL_WALL_CRUMBLED,
+    EL_BD_WALL,
+    EL_ROCK,
+    EL_BD_ROCK,
+    EL_BD_DIAMOND,
+    EL_BD_MAGIC_WALL,
+    EL_EXIT_CLOSED,
     EL_EXIT_OPEN,
     EL_STEELWALL,
     EL_PLAYER_1,
@@ -1686,6 +1573,56 @@ void InitElementPropertiesStatic()
     -1
   };
 
+  static int ep_sp_element[] =
+  {
+    EL_SP_EMPTY,
+    EL_SP_ZONK,
+    EL_SP_BASE,
+    EL_SP_MURPHY,
+    EL_SP_INFOTRON,
+    EL_SP_CHIP_SINGLE,
+    EL_SP_HARDWARE_GRAY,
+    EL_SP_EXIT_CLOSED,
+    EL_SP_EXIT_OPEN,
+    EL_SP_DISK_ORANGE,
+    EL_SP_PORT_RIGHT,
+    EL_SP_PORT_DOWN,
+    EL_SP_PORT_LEFT,
+    EL_SP_PORT_UP,
+    EL_SP_GRAVITY_PORT_RIGHT,
+    EL_SP_GRAVITY_PORT_DOWN,
+    EL_SP_GRAVITY_PORT_LEFT,
+    EL_SP_GRAVITY_PORT_UP,
+    EL_SP_SNIKSNAK,
+    EL_SP_DISK_YELLOW,
+    EL_SP_TERMINAL,
+    EL_SP_DISK_RED,
+    EL_SP_PORT_VERTICAL,
+    EL_SP_PORT_HORIZONTAL,
+    EL_SP_PORT_ANY,
+    EL_SP_ELECTRON,
+    EL_SP_BUGGY_BASE,
+    EL_SP_CHIP_LEFT,
+    EL_SP_CHIP_RIGHT,
+    EL_SP_HARDWARE_BASE_1,
+    EL_SP_HARDWARE_GREEN,
+    EL_SP_HARDWARE_BLUE,
+    EL_SP_HARDWARE_RED,
+    EL_SP_HARDWARE_YELLOW,
+    EL_SP_HARDWARE_BASE_2,
+    EL_SP_HARDWARE_BASE_3,
+    EL_SP_HARDWARE_BASE_4,
+    EL_SP_HARDWARE_BASE_5,
+    EL_SP_HARDWARE_BASE_6,
+    EL_SP_CHIP_TOP,
+    EL_SP_CHIP_BOTTOM,
+    /* additional elements that appeared in newer Supaplex levels */
+    EL_INVISIBLE_WALL,
+    /* more than one murphy in a level results in an inactive clone */
+    EL_SP_MURPHY_CLONE,
+    -1
+  };
+
   static int ep_sb_element[] =
   {
     EL_EMPTY,
@@ -1700,8 +1637,8 @@ void InitElementPropertiesStatic()
 
   static int ep_gem[] =
   {
-    EL_EMERALD,
     EL_BD_DIAMOND,
+    EL_EMERALD,
     EL_EMERALD_YELLOW,
     EL_EMERALD_RED,
     EL_EMERALD_PURPLE,
@@ -1709,26 +1646,60 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_inactive[] =
+  static int ep_food_dark_yamyam[] =
   {
-    EL_EMPTY,
     EL_SAND,
-    EL_WALL,
-    EL_BD_WALL,
-    EL_WALL_CRUMBLED,
-    EL_STEELWALL,
+    EL_BUG,
+    EL_SPACESHIP,
+    EL_BD_BUTTERFLY,
+    EL_BD_FIREFLY,
+    EL_YAMYAM,
+    EL_ROBOT,
+    EL_PACMAN,
+    EL_AMOEBA_DROP,
     EL_AMOEBA_DEAD,
-    EL_QUICKSAND_EMPTY,
-    EL_STONEBLOCK,
-    EL_ROBOT_WHEEL,
-    EL_KEY_1,
-    EL_KEY_2,
-    EL_KEY_3,
-    EL_KEY_4,
-    EL_EM_KEY_1,
-    EL_EM_KEY_2,
-    EL_EM_KEY_3,
-    EL_EM_KEY_4,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
+    EL_EMERALD,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_DIAMOND,
+    EL_PEARL,
+    EL_CRYSTAL,
+    -1
+  };
+
+  static int ep_food_penguin[] =
+  {
+    EL_EMERALD,
+    EL_BD_DIAMOND,
+    EL_EMERALD_YELLOW,
+    EL_EMERALD_RED,
+    EL_EMERALD_PURPLE,
+    EL_DIAMOND,
+    EL_PEARL,
+    EL_CRYSTAL,
+    -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,
     EL_GATE_1,
     EL_GATE_2,
     EL_GATE_3,
@@ -1745,50 +1716,17 @@ void InitElementPropertiesStatic()
     EL_EM_GATE_2_GRAY,
     EL_EM_GATE_3_GRAY,
     EL_EM_GATE_4_GRAY,
-    EL_DYNAMITE,
-    EL_INVISIBLE_STEELWALL,
-    EL_INVISIBLE_WALL,
-    EL_INVISIBLE_SAND,
-    EL_LAMP,
-    EL_LAMP_ACTIVE,
-    EL_WALL_EMERALD,
-    EL_WALL_DIAMOND,
-    EL_WALL_BD_DIAMOND,
-    EL_WALL_EMERALD_YELLOW,
-    EL_DYNABOMB_INCREASE_NUMBER,
-    EL_DYNABOMB_INCREASE_SIZE,
-    EL_DYNABOMB_INCREASE_POWER,
-    EL_SOKOBAN_OBJECT,
-    EL_SOKOBAN_FIELD_EMPTY,
-    EL_SOKOBAN_FIELD_FULL,
-    EL_WALL_EMERALD_RED,
-    EL_WALL_EMERALD_PURPLE,
-    EL_ACID_POOL_TOPLEFT,
-    EL_ACID_POOL_TOPRIGHT,
-    EL_ACID_POOL_BOTTOMLEFT,
-    EL_ACID_POOL_BOTTOM,
-    EL_ACID_POOL_BOTTOMRIGHT,
-    EL_MAGIC_WALL,
-    EL_MAGIC_WALL_DEAD,
-    EL_BD_MAGIC_WALL,
-    EL_BD_MAGIC_WALL_DEAD,
-    EL_AMOEBA_TO_DIAMOND,
-    EL_BLOCKED,
-    EL_SP_EMPTY,
-    EL_SP_BASE,
-    EL_SP_PORT_RIGHT,
-    EL_SP_PORT_DOWN,
-    EL_SP_PORT_LEFT,
-    EL_SP_PORT_UP,
-    EL_SP_GRAVITY_PORT_RIGHT,
-    EL_SP_GRAVITY_PORT_DOWN,
-    EL_SP_GRAVITY_PORT_LEFT,
-    EL_SP_GRAVITY_PORT_UP,
-    EL_SP_PORT_HORIZONTAL,
-    EL_SP_PORT_VERTICAL,
-    EL_SP_PORT_ANY,
-    EL_SP_DISK_RED,
-    EL_SP_DISK_YELLOW,
+    EL_EXIT_CLOSED,
+    EL_EXIT_OPENING,
+    EL_EXIT_OPEN,
+    EL_WALL,
+    EL_WALL_CRUMBLED,
+    EL_EXPANDABLE_WALL,
+    EL_EXPANDABLE_WALL_HORIZONTAL,
+    EL_EXPANDABLE_WALL_VERTICAL,
+    EL_EXPANDABLE_WALL_ANY,
+    EL_EXPANDABLE_WALL_GROWING,
+    EL_BD_WALL,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
@@ -1805,30 +1743,14 @@ void InitElementPropertiesStatic()
     EL_SP_HARDWARE_BASE_4,
     EL_SP_HARDWARE_BASE_5,
     EL_SP_HARDWARE_BASE_6,
-    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_SIGN_EXCLAMATION,
-    EL_SIGN_RADIOACTIVITY,
-    EL_SIGN_STOP,
-    EL_SIGN_WHEELCHAIR,
-    EL_SIGN_PARKING,
-    EL_SIGN_ONEWAY,
-    EL_SIGN_HEART,
-    EL_SIGN_TRIANGLE,
-    EL_SIGN_ROUND,
-    EL_SIGN_EXIT,
-    EL_SIGN_YINYANG,
-    EL_SIGN_OTHER,
+    EL_SP_TERMINAL,
+    EL_SP_TERMINAL_ACTIVE,
+    EL_SP_EXIT_CLOSED,
+    EL_SP_EXIT_OPEN,
+    EL_INVISIBLE_STEELWALL,
+    EL_INVISIBLE_STEELWALL_ACTIVE,
+    EL_INVISIBLE_WALL,
+    EL_INVISIBLE_WALL_ACTIVE,
     EL_STEELWALL_SLANTED,
     EL_EMC_STEELWALL_1,
     EL_EMC_STEELWALL_2,
@@ -1845,82 +1767,123 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_explosive[] =
+  static int ep_historic_solid[] =
   {
-    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,
-    -1
-  };
-
-  static int ep_food_penguin[] =
-  {
-    EL_EMERALD,
-    EL_BD_DIAMOND,
-    EL_EMERALD_YELLOW,
-    EL_EMERALD_RED,
-    EL_EMERALD_PURPLE,
-    EL_DIAMOND,
-    EL_PEARL,
-    EL_CRYSTAL,
-    -1
-  };
-
-  static int ep_pushable[] =
-  {
-    EL_ROCK,
-    EL_BD_ROCK,
-    EL_BOMB,
-    EL_NUT,
-    EL_TIME_ORB_EMPTY,
-    EL_SOKOBAN_FIELD_FULL,
-    EL_SOKOBAN_OBJECT,
-    EL_SATELLITE,
-    EL_SP_ZONK,
-    EL_SP_DISK_ORANGE,
-    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
-  };
-
-  static int ep_walkable_over[] =
-  {
-    EL_EMPTY_SPACE,
-    EL_SP_EMPTY_SPACE,
-    EL_SOKOBAN_FIELD_EMPTY,
+    EL_WALL,
+    EL_EXPANDABLE_WALL,
+    EL_EXPANDABLE_WALL_HORIZONTAL,
+    EL_EXPANDABLE_WALL_VERTICAL,
+    EL_EXPANDABLE_WALL_ANY,
+    EL_BD_WALL,
+    EL_WALL_CRUMBLED,
+    EL_EXIT_CLOSED,
+    EL_EXIT_OPENING,
     EL_EXIT_OPEN,
+    EL_AMOEBA_DEAD,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
+    EL_QUICKSAND_EMPTY,
+    EL_QUICKSAND_FULL,
+    EL_QUICKSAND_FILLING,
+    EL_QUICKSAND_EMPTYING,
+    EL_MAGIC_WALL,
+    EL_MAGIC_WALL_ACTIVE,
+    EL_MAGIC_WALL_EMPTYING,
+    EL_MAGIC_WALL_FILLING,
+    EL_MAGIC_WALL_FULL,
+    EL_MAGIC_WALL_DEAD,
+    EL_BD_MAGIC_WALL,
+    EL_BD_MAGIC_WALL_ACTIVE,
+    EL_BD_MAGIC_WALL_EMPTYING,
+    EL_BD_MAGIC_WALL_FULL,
+    EL_BD_MAGIC_WALL_FILLING,
+    EL_BD_MAGIC_WALL_DEAD,
+    EL_GAME_OF_LIFE,
+    EL_BIOMAZE,
+    EL_SP_CHIP_SINGLE,
+    EL_SP_CHIP_LEFT,
+    EL_SP_CHIP_RIGHT,
+    EL_SP_CHIP_TOP,
+    EL_SP_CHIP_BOTTOM,
+    EL_SP_TERMINAL,
+    EL_SP_TERMINAL_ACTIVE,
+    EL_SP_EXIT_CLOSED,
     EL_SP_EXIT_OPEN,
+    EL_INVISIBLE_WALL,
+    EL_INVISIBLE_WALL_ACTIVE,
+    EL_SWITCHGATE_SWITCH_UP,
+    EL_SWITCHGATE_SWITCH_DOWN,
+    EL_TIMEGATE_SWITCH,
+    EL_TIMEGATE_SWITCH_ACTIVE,
+    EL_EMC_WALL_1,
+    EL_EMC_WALL_2,
+    EL_EMC_WALL_3,
+    EL_EMC_WALL_4,
+    EL_EMC_WALL_5,
+    EL_EMC_WALL_6,
+    EL_EMC_WALL_7,
+    EL_EMC_WALL_8,
+    EL_WALL_PEARL,
+    EL_WALL_CRYSTAL,
+
+    /* the following elements are a direct copy of "indestructible" elements,
+       except "EL_ACID", which is "indestructible", but not "solid"! */
+#if 0
+    EL_ACID,
+#endif
+    EL_STEELWALL,
+    EL_ACID_POOL_TOPLEFT,
+    EL_ACID_POOL_TOPRIGHT,
+    EL_ACID_POOL_BOTTOMLEFT,
+    EL_ACID_POOL_BOTTOM,
+    EL_ACID_POOL_BOTTOMRIGHT,
+    EL_SP_HARDWARE_GRAY,
+    EL_SP_HARDWARE_GREEN,
+    EL_SP_HARDWARE_BLUE,
+    EL_SP_HARDWARE_RED,
+    EL_SP_HARDWARE_YELLOW,
+    EL_SP_HARDWARE_BASE_1,
+    EL_SP_HARDWARE_BASE_2,
+    EL_SP_HARDWARE_BASE_3,
+    EL_SP_HARDWARE_BASE_4,
+    EL_SP_HARDWARE_BASE_5,
+    EL_SP_HARDWARE_BASE_6,
+    EL_INVISIBLE_STEELWALL,
+    EL_INVISIBLE_STEELWALL_ACTIVE,
+    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_LIGHT_SWITCH,
+    EL_LIGHT_SWITCH_ACTIVE,
+    EL_SIGN_EXCLAMATION,
+    EL_SIGN_RADIOACTIVITY,
+    EL_SIGN_STOP,
+    EL_SIGN_WHEELCHAIR,
+    EL_SIGN_PARKING,
+    EL_SIGN_ONEWAY,
+    EL_SIGN_HEART,
+    EL_SIGN_TRIANGLE,
+    EL_SIGN_ROUND,
+    EL_SIGN_EXIT,
+    EL_SIGN_YINYANG,
+    EL_SIGN_OTHER,
+    EL_STEELWALL_SLANTED,
+    EL_EMC_STEELWALL_1,
+    EL_EMC_STEELWALL_2,
+    EL_EMC_STEELWALL_3,
+    EL_EMC_STEELWALL_4,
+    EL_CRYSTAL,
     EL_GATE_1,
     EL_GATE_2,
     EL_GATE_3,
@@ -1929,11 +1892,22 @@ void InitElementPropertiesStatic()
     EL_GATE_2_GRAY,
     EL_GATE_3_GRAY,
     EL_GATE_4_GRAY,
-    -1
-  };
-
-  static int ep_walkable_inside[] =
-  {
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
+    EL_SWITCHGATE_OPEN,
+    EL_SWITCHGATE_OPENING,
+    EL_SWITCHGATE_CLOSED,
+    EL_SWITCHGATE_CLOSING,
+    EL_TIMEGATE_OPEN,
+    EL_TIMEGATE_OPENING,
+    EL_TIMEGATE_CLOSED,
+    EL_TIMEGATE_CLOSING,
     EL_TUBE_ANY,
     EL_TUBE_VERTICAL,
     EL_TUBE_HORIZONTAL,
@@ -1948,108 +1922,6 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_walkable_under[] =
-  {
-    -1
-  };
-
-  static int ep_passable_over[] =
-  {
-    EL_EM_GATE_1,
-    EL_EM_GATE_2,
-    EL_EM_GATE_3,
-    EL_EM_GATE_4,
-    EL_EM_GATE_1_GRAY,
-    EL_EM_GATE_2_GRAY,
-    EL_EM_GATE_3_GRAY,
-    EL_EM_GATE_4_GRAY,
-    EL_SWITCHGATE_OPEN,
-    EL_TIMEGATE_OPEN,
-    -1
-  };
-
-  static int ep_passable_inside[] =
-  {
-    EL_SP_PORT_LEFT,
-    EL_SP_PORT_RIGHT,
-    EL_SP_PORT_UP,
-    EL_SP_PORT_DOWN,
-    EL_SP_PORT_HORIZONTAL,
-    EL_SP_PORT_VERTICAL,
-    EL_SP_PORT_ANY,
-    EL_SP_GRAVITY_PORT_LEFT,
-    EL_SP_GRAVITY_PORT_RIGHT,
-    EL_SP_GRAVITY_PORT_UP,
-    EL_SP_GRAVITY_PORT_DOWN,
-    -1
-  };
-
-  static int ep_passable_under[] =
-  {
-    -1
-  };
-
-  static int ep_diggable[] =
-  {
-    EL_SAND,
-    EL_SP_BASE,
-    EL_SP_BUGGY_BASE,
-    EL_SP_BUGGY_BASE_ACTIVATING,
-    EL_TRAP,
-    EL_INVISIBLE_SAND,
-    EL_INVISIBLE_SAND_ACTIVE,
-#if 1
-    EL_LANDMINE,
-    EL_TRAP_ACTIVE,
-    EL_SP_BUGGY_BASE_ACTIVE,
-#endif
-    -1
-  };
-
-  static int ep_collectible[] =
-  {
-    EL_BD_DIAMOND,
-    EL_EMERALD,
-    EL_DIAMOND,
-    EL_EMERALD_YELLOW,
-    EL_EMERALD_RED,
-    EL_EMERALD_PURPLE,
-    EL_KEY_1,
-    EL_KEY_2,
-    EL_KEY_3,
-    EL_KEY_4,
-    EL_EM_KEY_1,
-    EL_EM_KEY_2,
-    EL_EM_KEY_3,
-    EL_EM_KEY_4,
-    EL_DYNAMITE,
-    EL_DYNABOMB_INCREASE_NUMBER,
-    EL_DYNABOMB_INCREASE_SIZE,
-    EL_DYNABOMB_INCREASE_POWER,
-    EL_SP_INFOTRON,
-    EL_SP_DISK_RED,
-    EL_PEARL,
-    EL_CRYSTAL,
-    EL_KEY_WHITE,
-    EL_SHIELD_NORMAL,
-    EL_SHIELD_DEADLY,
-    EL_EXTRA_TIME,
-    EL_ENVELOPE,
-    EL_SPEED_PILL,
-    -1
-  };
-
-  static int ep_active_bomb[] =
-  {
-    EL_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
-  };
-
   static int ep_belt[] =
   {
     EL_CONVEYOR_BELT_1_LEFT,
@@ -2084,35 +1956,167 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_belt_switch[] =
+  static int ep_belt_switch[] =
+  {
+    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,
+    -1
+  };
+
+  static int ep_tube[] =
+  {
+    EL_TUBE_LEFT_UP,
+    EL_TUBE_LEFT_DOWN,
+    EL_TUBE_RIGHT_UP,
+    EL_TUBE_RIGHT_DOWN,
+    EL_TUBE_HORIZONTAL,
+    EL_TUBE_HORIZONTAL_UP,
+    EL_TUBE_HORIZONTAL_DOWN,
+    EL_TUBE_VERTICAL,
+    EL_TUBE_VERTICAL_LEFT,
+    EL_TUBE_VERTICAL_RIGHT,
+    EL_TUBE_ANY,
+    -1
+  };
+
+  static int ep_keygate[] =
+  {
+    EL_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
+    -1
+  };
+
+  static int ep_amoeboid[] =
+  {
+    EL_AMOEBA_DEAD,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
+    -1
+  };
+
+  static int ep_amoebalive[] =
+  {
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
+    -1
+  };
+
+  static int ep_has_content[] =
   {
-    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_YAMYAM,
+    EL_AMOEBA_WET,
+    EL_AMOEBA_DRY,
+    EL_AMOEBA_FULL,
+    EL_BD_AMOEBA,
     -1
   };
 
-  static int ep_sp_element[] =
+  static int ep_active_bomb[] =
+  {
+    EL_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
+  };
+
+  static int ep_inactive[] =
   {
+    EL_EMPTY,
+    EL_SAND,
+    EL_WALL,
+    EL_BD_WALL,
+    EL_WALL_CRUMBLED,
+    EL_STEELWALL,
+    EL_AMOEBA_DEAD,
+    EL_QUICKSAND_EMPTY,
+    EL_STONEBLOCK,
+    EL_ROBOT_WHEEL,
+    EL_KEY_1,
+    EL_KEY_2,
+    EL_KEY_3,
+    EL_KEY_4,
+    EL_EM_KEY_1,
+    EL_EM_KEY_2,
+    EL_EM_KEY_3,
+    EL_EM_KEY_4,
+    EL_GATE_1,
+    EL_GATE_2,
+    EL_GATE_3,
+    EL_GATE_4,
+    EL_GATE_1_GRAY,
+    EL_GATE_2_GRAY,
+    EL_GATE_3_GRAY,
+    EL_GATE_4_GRAY,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1_GRAY,
+    EL_EM_GATE_2_GRAY,
+    EL_EM_GATE_3_GRAY,
+    EL_EM_GATE_4_GRAY,
+    EL_DYNAMITE,
+    EL_INVISIBLE_STEELWALL,
+    EL_INVISIBLE_WALL,
+    EL_INVISIBLE_SAND,
+    EL_LAMP,
+    EL_LAMP_ACTIVE,
+    EL_WALL_EMERALD,
+    EL_WALL_DIAMOND,
+    EL_WALL_BD_DIAMOND,
+    EL_WALL_EMERALD_YELLOW,
+    EL_DYNABOMB_INCREASE_NUMBER,
+    EL_DYNABOMB_INCREASE_SIZE,
+    EL_DYNABOMB_INCREASE_POWER,
+    EL_SOKOBAN_OBJECT,
+    EL_SOKOBAN_FIELD_EMPTY,
+    EL_SOKOBAN_FIELD_FULL,
+    EL_WALL_EMERALD_RED,
+    EL_WALL_EMERALD_PURPLE,
+    EL_ACID_POOL_TOPLEFT,
+    EL_ACID_POOL_TOPRIGHT,
+    EL_ACID_POOL_BOTTOMLEFT,
+    EL_ACID_POOL_BOTTOM,
+    EL_ACID_POOL_BOTTOMRIGHT,
+    EL_MAGIC_WALL,
+    EL_MAGIC_WALL_DEAD,
+    EL_BD_MAGIC_WALL,
+    EL_BD_MAGIC_WALL_DEAD,
+    EL_AMOEBA_TO_DIAMOND,
+    EL_BLOCKED,
     EL_SP_EMPTY,
-    EL_SP_ZONK,
     EL_SP_BASE,
-    EL_SP_MURPHY,
-    EL_SP_INFOTRON,
-    EL_SP_CHIP_SINGLE,
-    EL_SP_HARDWARE_GRAY,
-    EL_SP_EXIT_CLOSED,
-    EL_SP_EXIT_OPEN,
-    EL_SP_DISK_ORANGE,
     EL_SP_PORT_RIGHT,
     EL_SP_PORT_DOWN,
     EL_SP_PORT_LEFT,
@@ -2121,59 +2125,64 @@ void InitElementPropertiesStatic()
     EL_SP_GRAVITY_PORT_DOWN,
     EL_SP_GRAVITY_PORT_LEFT,
     EL_SP_GRAVITY_PORT_UP,
-    EL_SP_SNIKSNAK,
-    EL_SP_DISK_YELLOW,
-    EL_SP_TERMINAL,
-    EL_SP_DISK_RED,
-    EL_SP_PORT_VERTICAL,
     EL_SP_PORT_HORIZONTAL,
+    EL_SP_PORT_VERTICAL,
     EL_SP_PORT_ANY,
-    EL_SP_ELECTRON,
-    EL_SP_BUGGY_BASE,
+    EL_SP_DISK_RED,
+    EL_SP_DISK_YELLOW,
+    EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
-    EL_SP_HARDWARE_BASE_1,
+    EL_SP_CHIP_TOP,
+    EL_SP_CHIP_BOTTOM,
+    EL_SP_HARDWARE_GRAY,
     EL_SP_HARDWARE_GREEN,
     EL_SP_HARDWARE_BLUE,
     EL_SP_HARDWARE_RED,
     EL_SP_HARDWARE_YELLOW,
+    EL_SP_HARDWARE_BASE_1,
     EL_SP_HARDWARE_BASE_2,
     EL_SP_HARDWARE_BASE_3,
     EL_SP_HARDWARE_BASE_4,
     EL_SP_HARDWARE_BASE_5,
     EL_SP_HARDWARE_BASE_6,
-    EL_SP_CHIP_TOP,
-    EL_SP_CHIP_BOTTOM,
-    /* additional elements that appeared in newer Supaplex levels */
-    EL_INVISIBLE_WALL,
-    /* more than one murphy in a level results in an inactive clone */
-    EL_SP_MURPHY_CLONE,
-    -1
-  };
-
-  static int ep_has_content[] =
-  {
-    EL_YAMYAM,
-    EL_AMOEBA_WET,
-    EL_AMOEBA_DRY,
-    EL_AMOEBA_FULL,
-    EL_BD_AMOEBA,
-    -1
-  };
-
-  static int ep_tube[] =
-  {
-    EL_TUBE_LEFT_UP,
-    EL_TUBE_LEFT_DOWN,
-    EL_TUBE_RIGHT_UP,
-    EL_TUBE_RIGHT_DOWN,
-    EL_TUBE_HORIZONTAL,
-    EL_TUBE_HORIZONTAL_UP,
-    EL_TUBE_HORIZONTAL_DOWN,
-    EL_TUBE_VERTICAL,
-    EL_TUBE_VERTICAL_LEFT,
-    EL_TUBE_VERTICAL_RIGHT,
-    EL_TUBE_ANY,
+    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_SIGN_EXCLAMATION,
+    EL_SIGN_RADIOACTIVITY,
+    EL_SIGN_STOP,
+    EL_SIGN_WHEELCHAIR,
+    EL_SIGN_PARKING,
+    EL_SIGN_ONEWAY,
+    EL_SIGN_HEART,
+    EL_SIGN_TRIANGLE,
+    EL_SIGN_ROUND,
+    EL_SIGN_EXIT,
+    EL_SIGN_YINYANG,
+    EL_SIGN_OTHER,
+    EL_STEELWALL_SLANTED,
+    EL_EMC_STEELWALL_1,
+    EL_EMC_STEELWALL_2,
+    EL_EMC_STEELWALL_3,
+    EL_EMC_STEELWALL_4,
+    EL_EMC_WALL_1,
+    EL_EMC_WALL_2,
+    EL_EMC_WALL_3,
+    EL_EMC_WALL_4,
+    EL_EMC_WALL_5,
+    EL_EMC_WALL_6,
+    EL_EMC_WALL_7,
+    EL_EMC_WALL_8,
     -1
   };
 
@@ -2183,47 +2192,48 @@ void InitElementPropertiesStatic()
     int property;
   } element_properties[] =
   {
-    { ep_amoebalive,		EP_AMOEBALIVE		},
-    { ep_amoeboid,		EP_AMOEBOID		},
-    { ep_keygate,		EP_KEYGATE		},
-    { ep_can_be_crumbled,	EP_CAN_BE_CRUMBLED	},
-    { ep_historic_solid,	EP_HISTORIC_SOLID	},
+    { ep_diggable,		EP_DIGGABLE		},
+    { ep_collectible,		EP_COLLECTIBLE		},
     { ep_indestructible,	EP_INDESTRUCTIBLE	},
     { ep_slippery,		EP_SLIPPERY		},
-    { ep_enemy,			EP_ENEMY		},
-    { ep_historic_wall,		EP_HISTORIC_WALL	},
     { ep_can_fall,		EP_CAN_FALL		},
     { ep_can_smash,		EP_CAN_SMASH		},
-    { ep_can_change,		EP_CAN_CHANGE		},
-    { ep_can_move,		EP_CAN_MOVE		},
-    { ep_could_move,		EP_COULD_MOVE		},
-    { ep_dont_touch,		EP_DONT_TOUCH		},
-    { ep_dont_go_to,		EP_DONT_GO_TO		},
-    { ep_food_dark_yamyam,	EP_FOOD_DARK_YAMYAM	},
-    { ep_bd_element,		EP_BD_ELEMENT		},
-    { ep_sb_element,		EP_SB_ELEMENT		},
-    { ep_gem,			EP_GEM			},
-    { ep_inactive,		EP_INACTIVE		},
-    { ep_explosive,		EP_EXPLOSIVE		},
-    { ep_food_penguin,		EP_FOOD_PENGUIN		},
-    { ep_pushable,		EP_PUSHABLE		},
-    { ep_player,		EP_PLAYER		},
     { 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_pushable,		EP_PUSHABLE		},
 
-    { ep_diggable,		EP_DIGGABLE		},
-    { ep_collectible,		EP_COLLECTIBLE		},
-    { ep_active_bomb,		EP_ACTIVE_BOMB		},
+    { ep_player,		EP_PLAYER		},
+    { ep_can_be_crumbled,	EP_CAN_BE_CRUMBLED	},
+    { ep_can_move,		EP_CAN_MOVE		},
+    { ep_can_pass_magic_wall,	EP_CAN_PASS_MAGIC_WALL	},
+    { ep_dont_touch,		EP_DONT_TOUCH		},
+    { ep_enemy,			EP_ENEMY		},
+    { ep_dont_go_to,		EP_DONT_GO_TO		},
+    { ep_can_explode,		EP_CAN_EXPLODE		},
+    { 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_belt,			EP_BELT			},
     { ep_belt_active,		EP_BELT_ACTIVE		},
     { ep_belt_switch,		EP_BELT_SWITCH		},
-    { ep_sp_element,		EP_SP_ELEMENT		},
-    { ep_has_content,		EP_HAS_CONTENT		},
     { ep_tube,			EP_TUBE			},
+    { ep_keygate,		EP_KEYGATE		},
+    { ep_amoeboid,		EP_AMOEBOID		},
+    { ep_amoebalive,		EP_AMOEBALIVE		},
+    { ep_has_content,		EP_HAS_CONTENT		},
+    { ep_active_bomb,		EP_ACTIVE_BOMB		},
+    { ep_inactive,		EP_INACTIVE		},
+
     { NULL,			-1			}
   };
 
@@ -2249,18 +2259,16 @@ void InitElementPropertiesEngine(int engine_version)
     EP_AMOEBALIVE,
     EP_AMOEBOID,
     EP_PFORTE,
-    EP_SOLID,
     EP_ENEMY,
     EP_MAUER,
     EP_CAN_FALL,
     EP_CAN_SMASH,
-    EP_CAN_CHANGE,
+    EP_CAN_PASS_MAGIC_WALL,
     EP_CAN_MOVE,
-    EP_COULD_MOVE,
     EP_DONT_TOUCH,
     EP_DONT_GO_TO,
     EP_GEM,
-    EP_EXPLOSIVE,
+    EP_CAN_EXPLODE,
     EP_PUSHABLE,
     EP_PLAYER,
     EP_HAS_CONTENT,
@@ -2287,7 +2295,6 @@ void InitElementPropertiesEngine(int engine_version)
     EP_CAN_FALL,
     EP_CAN_SMASH,
     EP_CAN_MOVE,
-    EP_COULD_MOVE,
     EP_DONT_GO_TO,
     EP_FOOD_DARK_YAMYAM,
     EP_GEM,
@@ -2306,31 +2313,42 @@ void InitElementPropertiesEngine(int engine_version)
 
   int i, j;
 
+#if 0
+  InitElementPropertiesStatic();
+#endif
+
   /* set all special, combined or engine dependant 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)));
 
-    if (IS_PASSABLE_OVER(i) || IS_PASSABLE_INSIDE(i) || IS_PASSABLE_UNDER(i))
-      SET_PROPERTY(i, EP_PASSABLE, TRUE);
+    SET_PROPERTY(i, EP_PASSABLE, (IS_PASSABLE_OVER(i) ||
+				  IS_PASSABLE_INSIDE(i) ||
+				  IS_PASSABLE_UNDER(i)));
 
-    if (IS_WALKABLE_OVER(i) || IS_PASSABLE_OVER(i))
-      SET_PROPERTY(i, EP_ACCESSIBLE_OVER, TRUE);
+    SET_PROPERTY(i, EP_ACCESSIBLE_OVER, (IS_WALKABLE_OVER(i) ||
+					 IS_PASSABLE_OVER(i)));
 
-    if (IS_WALKABLE_INSIDE(i) || IS_PASSABLE_INSIDE(i))
-      SET_PROPERTY(i, EP_ACCESSIBLE_INSIDE, TRUE);
+    SET_PROPERTY(i, EP_ACCESSIBLE_INSIDE, (IS_WALKABLE_INSIDE(i) ||
+					   IS_PASSABLE_INSIDE(i)));
 
-    if (IS_WALKABLE_UNDER(i) || IS_PASSABLE_UNDER(i))
-      SET_PROPERTY(i, EP_ACCESSIBLE_UNDER, TRUE);
+    SET_PROPERTY(i, EP_ACCESSIBLE_UNDER, (IS_WALKABLE_UNDER(i) ||
+					  IS_PASSABLE_UNDER(i)));
 
-    if (IS_WALKABLE(i) || IS_PASSABLE(i))
-      SET_PROPERTY(i, EP_ACCESSIBLE, TRUE);
+    SET_PROPERTY(i, EP_ACCESSIBLE, (IS_WALKABLE(i) ||
+				    IS_PASSABLE(i)));
 
     /* ---------- WALL ----------------------------------------------------- */
     SET_PROPERTY(i, EP_WALL, TRUE);	/* default: element is wall */
@@ -2343,17 +2361,21 @@ void InitElementPropertiesEngine(int engine_version)
     if (IS_HISTORIC_WALL(i))
       SET_PROPERTY(i, EP_WALL, TRUE);
 
-    /* ---------- SOLID ---------------------------------------------------- */
+    /* ---------- SOLID_FOR_PUSHING ---------------------------------------- */
     if (engine_version < VERSION_IDENT(2,2,0))
-      SET_PROPERTY(i, EP_SOLID, IS_HISTORIC_SOLID(i));
+      SET_PROPERTY(i, EP_SOLID_FOR_PUSHING, IS_HISTORIC_SOLID(i));
     else
-      SET_PROPERTY(i, EP_SOLID, (!IS_WALKABLE(i) &&
-				 !IS_DIGGABLE(i) &&
-				 !IS_COLLECTIBLE(i)));
+      SET_PROPERTY(i, EP_SOLID_FOR_PUSHING, (!IS_WALKABLE(i) &&
+					     !IS_DIGGABLE(i) &&
+					     !IS_COLLECTIBLE(i)));
 
     /* ---------- DRAGONFIRE_PROOF ----------------------------------------- */
+
     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)
@@ -2559,37 +2581,43 @@ static void InitArtworkConfig()
   static char *direction_id_suffix[NUM_DIRECTIONS + 1];
   static char *special_id_suffix[NUM_SPECIAL_GFX_ARGS + 1];
   static char *dummy[1] = { NULL };
-  static char *ignore_image_tokens[] =
-  {
-    "name",
-    "sort_priority",
-    "global.num_toons",
-    "menu.draw_xoffset",
-    "menu.draw_yoffset",
-    "menu.draw_xoffset.MAIN",
-    "menu.draw_yoffset.MAIN",
-    "menu.draw_xoffset.LEVELS",
-    "menu.draw_yoffset.LEVELS",
-    "menu.draw_xoffset.SCORES",
-    "menu.draw_yoffset.SCORES",
-    "menu.draw_xoffset.EDITOR",
-    "menu.draw_yoffset.EDITOR",
-    "menu.draw_xoffset.INFO",
-    "menu.draw_yoffset.INFO",
-    "menu.draw_xoffset.SETUP",
-    "menu.draw_yoffset.SETUP",
-    "door.step_offset",
-    "door.step_delay",
-    NULL
-  };
-  static char *ignore_sound_tokens[] =
+  static char *ignore_generic_tokens[] =
   {
     "name",
     "sort_priority",
     NULL
   };
+  static char **ignore_image_tokens, **ignore_sound_tokens;
+  int num_ignore_generic_tokens;
+  int num_ignore_image_tokens, num_ignore_sound_tokens;
   int i;
 
+  /* dynamically determine list of generic tokens to be ignored */
+  num_ignore_generic_tokens = 0;
+  for (i=0; ignore_generic_tokens[i] != NULL; i++)
+    num_ignore_generic_tokens++;
+
+  /* dynamically determine list of image tokens to be ignored */
+  num_ignore_image_tokens = num_ignore_generic_tokens;
+  for (i=0; image_config_vars[i].token != NULL; i++)
+    num_ignore_image_tokens++;
+  ignore_image_tokens =
+    checked_malloc((num_ignore_image_tokens + 1) * sizeof(char *));
+  for (i=0; i < num_ignore_generic_tokens; i++)
+    ignore_image_tokens[i] = ignore_generic_tokens[i];
+  for (i=0; i < num_ignore_image_tokens - num_ignore_generic_tokens; i++)
+    ignore_image_tokens[num_ignore_generic_tokens + i] =
+      image_config_vars[i].token;
+  ignore_image_tokens[num_ignore_image_tokens] = NULL;
+
+  /* dynamically determine list of sound tokens to be ignored */
+  num_ignore_sound_tokens = num_ignore_generic_tokens;
+  ignore_sound_tokens =
+    checked_malloc((num_ignore_sound_tokens + 1) * sizeof(char *));
+  for (i=0; i < num_ignore_generic_tokens; i++)
+    ignore_sound_tokens[i] = ignore_generic_tokens[i];
+  ignore_sound_tokens[num_ignore_sound_tokens] = NULL;
+
   for (i=0; i<MAX_NUM_ELEMENTS; i++)
     image_id_prefix[i] = element_info[i].token_name;
   for (i=0; i<NUM_FONTS; i++)
@@ -2912,6 +2940,12 @@ void ReloadCustomArtwork()
   }
 }
 
+void KeyboardAutoRepeatOffUnlessAutoplay()
+{
+  if (global.autoplay_leveldir == NULL)
+    KeyboardAutoRepeatOff();
+}
+
 
 /* ========================================================================= */
 /* OpenAll()                                                                 */