added using global levelset identifier and level number for network games
[rocksndiamonds.git] / src / files.c
index 16af2dd4b4d84769faffc1c981a4153040a98498..efbc26f8cb2797a1784498ae81fedea88e140acf 100644 (file)
 
 #include "files.h"
 #include "init.h"
+#include "screens.h"
 #include "tools.h"
 #include "tape.h"
+#include "config.h"
 
+#define ENABLE_UNUSED_CODE     0       /* currently unused functions */
+#define ENABLE_HISTORIC_CHUNKS 0       /* only for historic reference */
+#define ENABLE_RESERVED_CODE   0       /* reserved for later use */
 
 #define CHUNK_ID_LEN           4       /* IFF style chunk id length  */
 #define CHUNK_SIZE_UNDEFINED   0       /* undefined chunk size == 0  */
@@ -53,7 +58,7 @@
 
 #define TAPE_CHUNK_VERS_SIZE   8       /* size of file version chunk */
 #define TAPE_CHUNK_HEAD_SIZE   20      /* size of tape file header   */
-#define TAPE_CHUNK_HEAD_UNUSED 3       /* unused tape header bytes   */
+#define TAPE_CHUNK_HEAD_UNUSED 2       /* unused tape header bytes   */
 
 #define LEVEL_CHUNK_CNT3_SIZE(x)        (LEVEL_CHUNK_CNT3_HEADER + (x))
 #define LEVEL_CHUNK_CUS3_SIZE(x)        (2 + (x) * LEVEL_CPART_CUS3_SIZE)
@@ -240,6 +245,12 @@ static struct LevelFileConfigInfo chunk_config_INFO[] =
     &li.auto_exit_sokoban,             FALSE
   },
 
+  {
+    -1,                                        -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(10),
+    &li.auto_count_gems,               FALSE
+  },
+
   {
     -1,                                        -1,
     -1,                                        -1,
@@ -285,6 +296,11 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
     TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(12),
     &li.shifted_relocation,            FALSE
   },
+  {
+    EL_PLAYER_1,                       -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(15),
+    &li.lazy_relocation,               FALSE
+  },
 
   /* (these values are different for each player) */
   {
@@ -791,16 +807,69 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
     &li.num_ball_contents,             4, MAX_ELEMENT_CONTENTS
   },
 
-  /* ---------- unused values ----------------------------------------------- */
+  {
+    EL_MM_MCDUFFIN,                    -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(1),
+    &li.mm_laser_red,                  FALSE
+  },
+  {
+    EL_MM_MCDUFFIN,                    -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(2),
+    &li.mm_laser_green,                        FALSE
+  },
+  {
+    EL_MM_MCDUFFIN,                    -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(3),
+    &li.mm_laser_blue,                 TRUE
+  },
 
   {
-    EL_UNKNOWN,                                SAVE_CONF_NEVER,
+    EL_DF_LASER,                       -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(1),
+    &li.df_laser_red,                  TRUE
+  },
+  {
+    EL_DF_LASER,                       -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(2),
+    &li.df_laser_green,                        TRUE
+  },
+  {
+    EL_DF_LASER,                       -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(3),
+    &li.df_laser_blue,                 FALSE
+  },
+
+  {
+    EL_MM_FUSE_ACTIVE,                 -1,
+    TYPE_INTEGER,                      CONF_VALUE_16_BIT(1),
+    &li.mm_time_fuse,                  25
+  },
+  {
+    EL_MM_BOMB,                                -1,
     TYPE_INTEGER,                      CONF_VALUE_16_BIT(1),
-    &li.score[SC_UNKNOWN_14],          10
+    &li.mm_time_bomb,                  75
   },
+  {
+    EL_MM_GRAY_BALL,                   -1,
+    TYPE_INTEGER,                      CONF_VALUE_16_BIT(1),
+    &li.mm_time_ball,                  75
+  },
+  {
+    EL_MM_STEEL_BLOCK,                 -1,
+    TYPE_INTEGER,                      CONF_VALUE_16_BIT(1),
+    &li.mm_time_block,                 75
+  },
+  {
+    EL_MM_LIGHTBALL,                   -1,
+    TYPE_INTEGER,                      CONF_VALUE_16_BIT(1),
+    &li.score[SC_ELEM_BONUS],          10
+  },
+
+  /* ---------- unused values ----------------------------------------------- */
+
   {
     EL_UNKNOWN,                                SAVE_CONF_NEVER,
-    TYPE_INTEGER,                      CONF_VALUE_16_BIT(2),
+    TYPE_INTEGER,                      CONF_VALUE_16_BIT(1),
     &li.score[SC_UNKNOWN_15],          10
   },
 
@@ -867,8 +936,8 @@ static struct LevelFileConfigInfo chunk_config_CUSX_base[] =
     &xx_ei.properties[EP_BITFIELD_BASE_NR], EP_BITMASK_BASE_DEFAULT,
     &yy_ei.properties[EP_BITFIELD_BASE_NR]
   },
-#if 0
-  /* (reserved) */
+#if ENABLE_RESERVED_CODE
+  /* (reserved for later use) */
   {
     -1,                                        -1,
     TYPE_BITFIELD,                     CONF_VALUE_32_BIT(2),
@@ -1310,6 +1379,8 @@ filetype_id_list[] =
   { LEVEL_FILE_TYPE_DX,                "DX"    },
   { LEVEL_FILE_TYPE_SB,                "SB"    },
   { LEVEL_FILE_TYPE_DC,                "DC"    },
+  { LEVEL_FILE_TYPE_MM,                "MM"    },
+  { LEVEL_FILE_TYPE_MM,                "DF"    },
   { -1,                                NULL    },
 };
 
@@ -1320,13 +1391,6 @@ filetype_id_list[] =
 
 static boolean check_special_flags(char *flag)
 {
-#if 0
-  printf("::: '%s', '%s', '%s'\n",
-        flag,
-        options.special_flags,
-        leveldir_current->special_flags);
-#endif
-
   if (strEqual(options.special_flags, flag) ||
       strEqual(leveldir_current->special_flags, flag))
     return TRUE;
@@ -1575,11 +1639,6 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change)
 {
   xx_change = *change;         /* copy change data into temporary buffer */
 
-#if 0
-  /* (not needed; set by setConfigToDefaultsFromConfigList()) */
-  xx_num_contents = 1;
-#endif
-
   setConfigToDefaultsFromConfigList(chunk_config_CUSX_change);
 
   *change = xx_change;
@@ -1594,8 +1653,6 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change)
   change->post_change_function = NULL;
 }
 
-#if 1
-
 static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
 {
   int i, x, y;
@@ -1606,9 +1663,11 @@ static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
 
   setLevelInfoToDefaults_EM();
   setLevelInfoToDefaults_SP();
+  setLevelInfoToDefaults_MM();
 
   level->native_em_level = &native_em_level;
   level->native_sp_level = &native_sp_level;
+  level->native_mm_level = &native_mm_level;
 
   level->file_version = FILE_VERSION_ACTUAL;
   level->game_version = GAME_VERSION_ACTUAL;
@@ -1619,23 +1678,29 @@ static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
   level->encoding_16bit_yamyam = TRUE;
   level->encoding_16bit_amoeba = TRUE;
 
-  for (x = 0; x < MAX_LEV_FIELDX; x++)
-    for (y = 0; y < MAX_LEV_FIELDY; y++)
-      level->field[x][y] = EL_SAND;
-
+  /* clear level name and level author string buffers */
   for (i = 0; i < MAX_LEVEL_NAME_LEN; i++)
     level->name[i] = '\0';
   for (i = 0; i < MAX_LEVEL_AUTHOR_LEN; i++)
     level->author[i] = '\0';
 
+  /* set level name and level author to default values */
   strcpy(level->name, NAMELESS_LEVEL_NAME);
   strcpy(level->author, ANONYMOUS_NAME);
 
+  /* set level playfield to playable default level with player and exit */
+  for (x = 0; x < MAX_LEV_FIELDX; x++)
+    for (y = 0; y < MAX_LEV_FIELDY; y++)
+      level->field[x][y] = EL_SAND;
+
   level->field[0][0] = EL_PLAYER_1;
   level->field[STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED;
 
   BorderElement = EL_STEELWALL;
 
+  /* detect custom elements when loading them */
+  level->file_has_custom_elements = FALSE;
+
   /* set all bug compatibility flags to "false" => do not emulate this bug */
   level->use_action_after_change_bug = FALSE;
 
@@ -1768,207 +1833,67 @@ static void setLevelInfoToDefaults_Elements(struct LevelInfo *level)
 }
 
 static void setLevelInfoToDefaults(struct LevelInfo *level,
-                                  boolean level_info_only)
+                                  boolean level_info_only,
+                                  boolean reset_file_status)
 {
   setLevelInfoToDefaults_Level(level);
 
   if (!level_info_only)
     setLevelInfoToDefaults_Elements(level);
 
-  level->no_valid_file = FALSE;
+  if (reset_file_status)
+  {
+    level->no_valid_file = FALSE;
+    level->no_level_file = FALSE;
+  }
 
   level->changed = FALSE;
 }
 
-#else
-
-static void setLevelInfoToDefaults(struct LevelInfo *level,
-                                  boolean level_info_only)
+static void setFileInfoToDefaults(struct LevelFileInfo *level_file_info)
 {
-  static boolean clipboard_elements_initialized = FALSE;
-  int i, x, y;
-
-  if (level_info_only)
-    return;
-
-  InitElementPropertiesStatic();
-
-  li = *level;         /* copy level data into temporary buffer */
-
-  setConfigToDefaultsFromConfigList(chunk_config_INFO);
-  setConfigToDefaultsFromConfigList(chunk_config_ELEM);
-
-  *level = li;         /* copy temporary buffer back to level data */
-
-  setLevelInfoToDefaults_EM();
-  setLevelInfoToDefaults_SP();
-
-  level->native_em_level = &native_em_level;
-  level->native_sp_level = &native_sp_level;
-
-  level->file_version = FILE_VERSION_ACTUAL;
-  level->game_version = GAME_VERSION_ACTUAL;
-
-  level->creation_date = getCurrentDate();
-
-  level->encoding_16bit_field  = TRUE;
-  level->encoding_16bit_yamyam = TRUE;
-  level->encoding_16bit_amoeba = TRUE;
-
-  for (x = 0; x < MAX_LEV_FIELDX; x++)
-    for (y = 0; y < MAX_LEV_FIELDY; y++)
-      level->field[x][y] = EL_SAND;
+  level_file_info->nr = 0;
+  level_file_info->type = LEVEL_FILE_TYPE_UNKNOWN;
+  level_file_info->packed = FALSE;
 
-  for (i = 0; i < MAX_LEVEL_NAME_LEN; i++)
-    level->name[i] = '\0';
-  for (i = 0; i < MAX_LEVEL_AUTHOR_LEN; i++)
-    level->author[i] = '\0';
+  setString(&level_file_info->basename, NULL);
+  setString(&level_file_info->filename, NULL);
+}
 
-  strcpy(level->name, NAMELESS_LEVEL_NAME);
-  strcpy(level->author, ANONYMOUS_NAME);
+int getMappedElement_SB(int, boolean);
 
-  level->field[0][0] = EL_PLAYER_1;
-  level->field[STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED;
+static void ActivateLevelTemplate()
+{
+  int x, y;
 
-  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
+  if (check_special_flags("load_xsb_to_ces"))
   {
-    int element = i;
-    struct ElementInfo *ei = &element_info[element];
-
-    /* never initialize clipboard elements after the very first time */
-    /* (to be able to use clipboard elements between several levels) */
-    if (IS_CLIPBOARD_ELEMENT(element) && clipboard_elements_initialized)
-      continue;
-
-    if (IS_ENVELOPE(element))
-    {
-      int envelope_nr = element - EL_ENVELOPE_1;
-
-      setConfigToDefaultsFromConfigList(chunk_config_NOTE);
-
-      level->envelope[envelope_nr] = xx_envelope;
-    }
-
-    if (IS_CUSTOM_ELEMENT(element) ||
-       IS_GROUP_ELEMENT(element) ||
-       IS_INTERNAL_ELEMENT(element))
-    {
-      xx_ei = *ei;     /* copy element data into temporary buffer */
-
-      setConfigToDefaultsFromConfigList(chunk_config_CUSX_base);
-
-      *ei = xx_ei;
-    }
-
-    setElementChangePages(ei, 1);
-    setElementChangeInfoToDefaults(ei->change);
-
-    if (IS_CUSTOM_ELEMENT(element) ||
-       IS_GROUP_ELEMENT(element) ||
-       IS_INTERNAL_ELEMENT(element))
-    {
-      setElementDescriptionToDefault(ei);
-
-      ei->modified_settings = FALSE;
-    }
-
-    if (IS_CUSTOM_ELEMENT(element) ||
-       IS_INTERNAL_ELEMENT(element))
-    {
-      /* internal values used in level editor */
-
-      ei->access_type = 0;
-      ei->access_layer = 0;
-      ei->access_protected = 0;
-      ei->walk_to_action = 0;
-      ei->smash_targets = 0;
-      ei->deadliness = 0;
-
-      ei->can_explode_by_fire = FALSE;
-      ei->can_explode_smashed = FALSE;
-      ei->can_explode_impact = FALSE;
-
-      ei->current_change_page = 0;
-    }
-
-    if (IS_GROUP_ELEMENT(element) ||
-       IS_INTERNAL_ELEMENT(element))
+    /* fill smaller playfields with padding "beyond border wall" elements */
+    if (level.fieldx < level_template.fieldx ||
+       level.fieldy < level_template.fieldy)
     {
-      struct ElementGroupInfo *group;
-
-      /* initialize memory for list of elements in group */
-      if (ei->group == NULL)
-       ei->group = checked_malloc(sizeof(struct ElementGroupInfo));
-
-      group = ei->group;
-
-      xx_group = *group;       /* copy group data into temporary buffer */
-
-      setConfigToDefaultsFromConfigList(chunk_config_GRPX);
+      short field[level.fieldx][level.fieldy];
+      int new_fieldx = MAX(level.fieldx, level_template.fieldx);
+      int new_fieldy = MAX(level.fieldy, level_template.fieldy);
+      int pos_fieldx = (new_fieldx - level.fieldx) / 2;
+      int pos_fieldy = (new_fieldy - level.fieldy) / 2;
 
-      *group = xx_group;
-    }
-  }
-
-  clipboard_elements_initialized = TRUE;
-
-  BorderElement = EL_STEELWALL;
-
-  level->no_valid_file = FALSE;
-
-  level->changed = FALSE;
-
-  /* set all bug compatibility flags to "false" => do not emulate this bug */
-  level->use_action_after_change_bug = FALSE;
-
-  if (leveldir_current)
-  {
-    /* try to determine better author name than 'anonymous' */
-    if (!strEqual(leveldir_current->author, ANONYMOUS_NAME))
-    {
-      strncpy(level->author, leveldir_current->author, MAX_LEVEL_AUTHOR_LEN);
-      level->author[MAX_LEVEL_AUTHOR_LEN] = '\0';
-    }
-    else
-    {
-      switch (LEVELCLASS(leveldir_current))
-      {
-       case LEVELCLASS_TUTORIAL:
-         strcpy(level->author, PROGRAM_AUTHOR_STRING);
-         break;
+      /* copy old playfield (which is smaller than the visible area) */
+      for (y = 0; y < level.fieldy; y++) for (x = 0; x < level.fieldx; x++)
+       field[x][y] = level.field[x][y];
 
-        case LEVELCLASS_CONTRIB:
-         strncpy(level->author, leveldir_current->name, MAX_LEVEL_AUTHOR_LEN);
-         level->author[MAX_LEVEL_AUTHOR_LEN] = '\0';
-         break;
+      /* fill new, larger playfield with "beyond border wall" elements */
+      for (y = 0; y < new_fieldy; y++) for (x = 0; x < new_fieldx; x++)
+       level.field[x][y] = getMappedElement_SB('_', TRUE);
 
-        case LEVELCLASS_PRIVATE:
-         strncpy(level->author, getRealName(), MAX_LEVEL_AUTHOR_LEN);
-         level->author[MAX_LEVEL_AUTHOR_LEN] = '\0';
-         break;
+      /* copy the old playfield to the middle of the new playfield */
+      for (y = 0; y < level.fieldy; y++) for (x = 0; x < level.fieldx; x++)
+       level.field[pos_fieldx + x][pos_fieldy + y] = field[x][y];
 
-        default:
-         /* keep default value */
-         break;
-      }
+      level.fieldx = new_fieldx;
+      level.fieldy = new_fieldy;
     }
   }
-}
-
-#endif
-
-static void setFileInfoToDefaults(struct LevelFileInfo *level_file_info)
-{
-  level_file_info->nr = 0;
-  level_file_info->type = LEVEL_FILE_TYPE_UNKNOWN;
-  level_file_info->packed = FALSE;
-  level_file_info->basename = NULL;
-  level_file_info->filename = NULL;
-}
-
-static void ActivateLevelTemplate()
-{
-  int x, y;
 
   /* Currently there is no special action needed to activate the template
      data, because 'element_info' property settings overwrite the original
@@ -2029,14 +1954,8 @@ static int getFileTypeFromBasename(char *basename)
   /* ---------- try to determine file type from filename ---------- */
 
   /* check for typical filename of a Supaplex level package file */
-#if 1
   if (strlen(basename) == 10 && strPrefixLower(basename, "levels.d"))
     return LEVEL_FILE_TYPE_SP;
-#else
-  if (strlen(basename) == 10 && (strncmp(basename, "levels.d", 8) == 0 ||
-                                strncmp(basename, "LEVELS.D", 8) == 0))
-    return LEVEL_FILE_TYPE_SP;
-#endif
 
   /* check for typical filename of a Diamond Caves II level package file */
   if (strSuffixLower(basename, ".dc") ||
@@ -2063,7 +1982,27 @@ static int getFileTypeFromBasename(char *basename)
   return LEVEL_FILE_TYPE_UNKNOWN;
 }
 
-static boolean checkForPackageFromBasename(char *basename)
+static int getFileTypeFromMagicBytes(char *filename, int type)
+{
+  File *file;
+
+  if ((file = openFile(filename, MODE_READ)))
+  {
+    char chunk_name[CHUNK_ID_LEN + 1];
+
+    getFileChunkBE(file, chunk_name, NULL);
+
+    if (strEqual(chunk_name, "MMII") ||
+       strEqual(chunk_name, "MIRR"))
+      type = LEVEL_FILE_TYPE_MM;
+
+    closeFile(file);
+  }
+
+  return type;
+}
+
+static boolean checkForPackageFromBasename(char *basename)
 {
   /* !!! WON'T WORK ANYMORE IF getFileTypeFromBasename() ALSO DETECTS !!!
      !!! SINGLE LEVELS (CURRENTLY ONLY DETECTS LEVEL PACKAGES         !!! */
@@ -2076,7 +2015,7 @@ static char *getSingleLevelBasenameExt(int nr, char *extension)
   static char basename[MAX_FILENAME_LEN];
 
   if (nr < 0)
-    sprintf(basename, "template.%s", extension);
+    sprintf(basename, "%s", LEVELTEMPLATE_FILENAME);
   else
     sprintf(basename, "%03d.%s", nr, extension);
 
@@ -2088,8 +2027,6 @@ static char *getSingleLevelBasename(int nr)
   return getSingleLevelBasenameExt(nr, LEVELFILE_EXTENSION);
 }
 
-#if 1
-
 static char *getPackedLevelBasename(int type)
 {
   static char basename[MAX_FILENAME_LEN];
@@ -2128,54 +2065,12 @@ static char *getPackedLevelBasename(int type)
   return basename;
 }
 
-#else
-
-static char *getPackedLevelBasename(int type)
-{
-  static char basename[MAX_FILENAME_LEN];
-  char *directory = getCurrentLevelDir();
-  DIR *dir;
-  struct dirent *dir_entry;
-
-  strcpy(basename, UNDEFINED_FILENAME);                /* default: undefined file */
-
-  if ((dir = opendir(directory)) == NULL)
-  {
-    Error(ERR_WARN, "cannot read current level directory '%s'", directory);
-
-    return basename;
-  }
-
-  while ((dir_entry = readdir(dir)) != NULL)   /* loop until last dir entry */
-  {
-    char *entry_basename = dir_entry->d_name;
-    int entry_type = getFileTypeFromBasename(entry_basename);
-
-    if (entry_type != LEVEL_FILE_TYPE_UNKNOWN) /* found valid level package */
-    {
-      if (type == LEVEL_FILE_TYPE_UNKNOWN ||
-         type == entry_type)
-      {
-       strcpy(basename, entry_basename);
-
-       break;
-      }
-    }
-  }
-
-  closedir(dir);
-
-  return basename;
-}
-
-#endif
-
 static char *getSingleLevelFilename(int nr)
 {
   return getLevelFilenameFromBasename(getSingleLevelBasename(nr));
 }
 
-#if 0
+#if ENABLE_UNUSED_CODE
 static char *getPackedLevelFilename(int type)
 {
   return getLevelFilenameFromBasename(getPackedLevelBasename(type));
@@ -2187,14 +2082,15 @@ char *getDefaultLevelFilename(int nr)
   return getSingleLevelFilename(nr);
 }
 
-#if 0
+#if ENABLE_UNUSED_CODE
 static void setLevelFileInfo_SingleLevelFilename(struct LevelFileInfo *lfi,
                                                 int type)
 {
   lfi->type = type;
   lfi->packed = FALSE;
-  lfi->basename = getSingleLevelBasename(lfi->nr, lfi->type);
-  lfi->filename = getLevelFilenameFromBasename(lfi->basename);
+
+  setString(&lfi->basename, getSingleLevelBasename(lfi->nr, lfi->type));
+  setString(&lfi->filename, getLevelFilenameFromBasename(lfi->basename));
 }
 #endif
 
@@ -2210,8 +2106,9 @@ static void setLevelFileInfo_FormatLevelFilename(struct LevelFileInfo *lfi,
 
   lfi->type = type;
   lfi->packed = FALSE;
-  lfi->basename = basename;
-  lfi->filename = getLevelFilenameFromBasename(lfi->basename);
+
+  setString(&lfi->basename, basename);
+  setString(&lfi->filename, getLevelFilenameFromBasename(lfi->basename));
 }
 
 static void setLevelFileInfo_PackedLevelFilename(struct LevelFileInfo *lfi,
@@ -2219,8 +2116,9 @@ static void setLevelFileInfo_PackedLevelFilename(struct LevelFileInfo *lfi,
 {
   lfi->type = type;
   lfi->packed = TRUE;
-  lfi->basename = getPackedLevelBasename(lfi->type);
-  lfi->filename = getLevelFilenameFromBasename(lfi->basename);
+
+  setString(&lfi->basename, getPackedLevelBasename(lfi->type));
+  setString(&lfi->filename, getLevelFilenameFromBasename(lfi->basename));
 }
 
 static int getFiletypeFromID(char *filetype_id)
@@ -2252,39 +2150,47 @@ static int getFiletypeFromID(char *filetype_id)
   return filetype;
 }
 
-static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi)
+char *getLocalLevelTemplateFilename()
 {
-  int nr = lfi->nr;
+  return getDefaultLevelFilename(-1);
+}
 
-  /* special case: level number is negative => check for level template file */
-  if (nr < 0)
-  {
-#if 1
-    /* global variable "leveldir_current" must be modified in the loop below */
-    LevelDirTree *leveldir_current_last = leveldir_current;
+char *getGlobalLevelTemplateFilename()
+{
+  /* global variable "leveldir_current" must be modified in the loop below */
+  LevelDirTree *leveldir_current_last = leveldir_current;
+  char *filename = NULL;
 
-    /* check for template level in path from current to topmost tree node */
+  /* check for template level in path from current to topmost tree node */
 
-    while (leveldir_current != NULL)
-    {
-      setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_RND,
-                                          "template.%s", LEVELFILE_EXTENSION);
+  while (leveldir_current != NULL)
+  {
+    filename = getDefaultLevelFilename(-1);
 
-      if (fileExists(lfi->filename))
-       break;
+    if (fileExists(filename))
+      break;
 
-      leveldir_current = leveldir_current->node_parent;
-    }
+    leveldir_current = leveldir_current->node_parent;
+  }
 
-    /* restore global variable "leveldir_current" modified in above loop */
-    leveldir_current = leveldir_current_last;
+  /* restore global variable "leveldir_current" modified in above loop */
+  leveldir_current = leveldir_current_last;
 
-#else
+  return filename;
+}
+
+static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi)
+{
+  int nr = lfi->nr;
 
+  /* special case: level number is negative => check for level template file */
+  if (nr < 0)
+  {
     setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_RND,
-                                        "template.%s", LEVELFILE_EXTENSION);
+                                        getSingleLevelBasename(-1));
 
-#endif
+    /* replace local level template filename with global template filename */
+    setString(&lfi->filename, getGlobalLevelTemplateFilename());
 
     /* no fallback if template file not existing */
     return;
@@ -2303,6 +2209,16 @@ static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi)
     if (fileExists(lfi->filename))
       return;
   }
+  else if (leveldir_current->level_filetype != NULL)
+  {
+    int filetype = getFiletypeFromID(leveldir_current->level_filetype);
+
+    /* check for specified native level file with standard file name */
+    setLevelFileInfo_FormatLevelFilename(lfi, filetype,
+                                        "%03d.%s", nr, LEVELFILE_EXTENSION);
+    if (fileExists(lfi->filename))
+      return;
+  }
 
   /* check for native Rocks'n'Diamonds level file */
   setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_RND,
@@ -2355,6 +2271,9 @@ static void determineLevelFileInfo_Filetype(struct LevelFileInfo *lfi)
 {
   if (lfi->type == LEVEL_FILE_TYPE_UNKNOWN)
     lfi->type = getFileTypeFromBasename(lfi->basename);
+
+  if (lfi->type == LEVEL_FILE_TYPE_RND)
+    lfi->type = getFileTypeFromMagicBytes(lfi->filename, lfi->type);
 }
 
 static void setLevelFileInfo(struct LevelFileInfo *level_file_info, int nr)
@@ -2368,6 +2287,17 @@ static void setLevelFileInfo(struct LevelFileInfo *level_file_info, int nr)
   determineLevelFileInfo_Filetype(level_file_info);
 }
 
+static void copyLevelFileInfo(struct LevelFileInfo *lfi_from,
+                             struct LevelFileInfo *lfi_to)
+{
+  lfi_to->nr     = lfi_from->nr;
+  lfi_to->type   = lfi_from->type;
+  lfi_to->packed = lfi_from->packed;
+
+  setString(&lfi_to->basename, lfi_from->basename);
+  setString(&lfi_to->filename, lfi_from->filename);
+}
+
 /* ------------------------------------------------------------------------- */
 /* functions for loading R'n'D level                                         */
 /* ------------------------------------------------------------------------- */
@@ -2449,8 +2379,6 @@ int getMappedElementByVersion(int element, int game_version)
   return element;
 }
 
-#if 1
-
 static int LoadLevel_VERS(File *file, int chunk_size, struct LevelInfo *level)
 {
   level->file_version = getFileVersion(file);
@@ -2629,20 +2557,13 @@ static int LoadLevel_CNT2(File *file, int chunk_size, struct LevelInfo *level)
   int i, x, y;
   int element;
   int num_contents;
-#if 0
-  int content_xsize, content_ysize;
-#endif
   int content_array[MAX_ELEMENT_CONTENTS][3][3];
 
   element = getMappedElement(getFile16BitBE(file));
   num_contents = getFile8Bit(file);
-#if 1
+
   getFile8Bit(file);   /* content x size (unused) */
   getFile8Bit(file);   /* content y size (unused) */
-#else
-  content_xsize = getFile8Bit(file);
-  content_ysize = getFile8Bit(file);
-#endif
 
   ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT2_UNUSED);
 
@@ -2738,6 +2659,8 @@ static int LoadLevel_CUS1(File *file, int chunk_size, struct LevelInfo *level)
     element_info[element].push_delay_random = 8;
   }
 
+  level->file_has_custom_elements = TRUE;
+
   return chunk_size;
 }
 
@@ -2764,6 +2687,8 @@ static int LoadLevel_CUS2(File *file, int chunk_size, struct LevelInfo *level)
       Error(ERR_WARN, "invalid custom element number %d", element);
   }
 
+  level->file_has_custom_elements = TRUE;
+
   return chunk_size;
 }
 
@@ -2855,6 +2780,8 @@ static int LoadLevel_CUS3(File *file, int chunk_size, struct LevelInfo *level)
     ei->modified_settings = TRUE;
   }
 
+  level->file_has_custom_elements = TRUE;
+
   return chunk_size;
 }
 
@@ -3003,6 +2930,8 @@ static int LoadLevel_CUS4(File *file, int chunk_size, struct LevelInfo *level)
   /* mark this custom element as modified */
   ei->modified_settings = TRUE;
 
+  level->file_has_custom_elements = TRUE;
+
   return chunk_size;
 }
 
@@ -3047,6 +2976,8 @@ static int LoadLevel_GRP1(File *file, int chunk_size, struct LevelInfo *level)
   /* mark this group element as modified */
   element_info[element].modified_settings = TRUE;
 
+  level->file_has_custom_elements = TRUE;
+
   return chunk_size;
 }
 
@@ -3259,6 +3190,8 @@ static int LoadLevel_NOTE(File *file, int chunk_size, struct LevelInfo *level)
   int envelope_nr = element - EL_ENVELOPE_1;
   int real_chunk_size = 2;
 
+  xx_envelope = level->envelope[envelope_nr];  /* copy into temporary buffer */
+
   while (!checkEndOfFile(file))
   {
     real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_NOTE,
@@ -3268,7 +3201,7 @@ static int LoadLevel_NOTE(File *file, int chunk_size, struct LevelInfo *level)
       break;
   }
 
-  level->envelope[envelope_nr] = xx_envelope;
+  level->envelope[envelope_nr] = xx_envelope;  /* copy from temporary buffer */
 
   return real_chunk_size;
 }
@@ -3337,6 +3270,8 @@ static int LoadLevel_CUSX(File *file, int chunk_size, struct LevelInfo *level)
       break;
   }
 
+  level->file_has_custom_elements = TRUE;
+
   return real_chunk_size;
 }
 
@@ -3362,4549 +3297,2263 @@ static int LoadLevel_GRPX(File *file, int chunk_size, struct LevelInfo *level)
   *ei = xx_ei;
   *group = xx_group;
 
-  return real_chunk_size;
-}
-
-#else
-
-static int LoadLevel_VERS(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  level->file_version = getFileVersion(file);
-  level->game_version = getFileVersion(file);
-
-  return chunk_size;
-}
-
-static int LoadLevel_DATE(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  level->creation_date.year  = getFile16BitBE(file);
-  level->creation_date.month = getFile8Bit(file);
-  level->creation_date.day   = getFile8Bit(file);
+  level->file_has_custom_elements = TRUE;
 
-  level->creation_date.src   = DATE_SRC_LEVELFILE;
-
-  return chunk_size;
+  return real_chunk_size;
 }
 
-static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level)
+static void LoadLevelFromFileInfo_RND(struct LevelInfo *level,
+                                     struct LevelFileInfo *level_file_info,
+                                     boolean level_info_only)
 {
-  int initial_player_stepsize;
-  int initial_player_gravity;
-  int i, x, y;
-
-  level->fieldx = getFile8Bit(file);
-  level->fieldy = getFile8Bit(file);
-
-  level->time          = getFile16BitBE(file);
-  level->gems_needed   = getFile16BitBE(file);
-
-  for (i = 0; i < MAX_LEVEL_NAME_LEN; i++)
-    level->name[i] = getFile8Bit(file);
-  level->name[MAX_LEVEL_NAME_LEN] = 0;
-
-  for (i = 0; i < LEVEL_SCORE_ELEMENTS; i++)
-    level->score[i] = getFile8Bit(file);
-
-  level->num_yamyam_contents = STD_ELEMENT_CONTENTS;
-  for (i = 0; i < STD_ELEMENT_CONTENTS; i++)
-    for (y = 0; y < 3; y++)
-      for (x = 0; x < 3; x++)
-       level->yamyam_content[i].e[x][y] = getMappedElement(getFile8Bit(file));
+  char *filename = level_file_info->filename;
+  char cookie[MAX_LINE_LEN];
+  char chunk_name[CHUNK_ID_LEN + 1];
+  int chunk_size;
+  File *file;
 
-  level->amoeba_speed          = getFile8Bit(file);
-  level->time_magic_wall       = getFile8Bit(file);
-  level->time_wheel            = getFile8Bit(file);
-  level->amoeba_content                = getMappedElement(getFile8Bit(file));
+  if (!(file = openFile(filename, MODE_READ)))
+  {
+    level->no_valid_file = TRUE;
+    level->no_level_file = TRUE;
 
-  initial_player_stepsize      = (getFile8Bit(file) == 1 ? STEPSIZE_FAST :
-                                  STEPSIZE_NORMAL);
+    if (level_info_only)
+      return;
 
-  for (i = 0; i < MAX_PLAYERS; i++)
-    level->initial_player_stepsize[i] = initial_player_stepsize;
+    Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
 
-  initial_player_gravity       = (getFile8Bit(file) == 1 ? TRUE : FALSE);
+    if (!setup.editor.use_template_for_new_levels)
+      return;
 
-  for (i = 0; i < MAX_PLAYERS; i++)
-    level->initial_player_gravity[i] = initial_player_gravity;
+    /* if level file not found, try to initialize level data from template */
+    filename = getGlobalLevelTemplateFilename();
 
-  level->encoding_16bit_field  = (getFile8Bit(file) == 1 ? TRUE : FALSE);
-  level->em_slippery_gems      = (getFile8Bit(file) == 1 ? TRUE : FALSE);
+    if (!(file = openFile(filename, MODE_READ)))
+      return;
 
-  level->use_custom_template   = (getFile8Bit(file) == 1 ? TRUE : FALSE);
+    /* default: for empty levels, use level template for custom elements */
+    level->use_custom_template = TRUE;
 
-  level->block_last_field      = (getFile8Bit(file) == 1 ? TRUE : FALSE);
-  level->sp_block_last_field   = (getFile8Bit(file) == 1 ? TRUE : FALSE);
-  level->can_move_into_acid_bits = getFile32BitBE(file);
-  level->dont_collide_with_bits = getFile8Bit(file);
+    level->no_valid_file = FALSE;
+  }
 
-  level->use_spring_bug                = (getFile8Bit(file) == 1 ? TRUE : FALSE);
-  level->use_step_counter      = (getFile8Bit(file) == 1 ? TRUE : FALSE);
+  getFileChunkBE(file, chunk_name, NULL);
+  if (strEqual(chunk_name, "RND1"))
+  {
+    getFile32BitBE(file);              /* not used */
 
-  level->instant_relocation    = (getFile8Bit(file) == 1 ? TRUE : FALSE);
-  level->can_pass_to_walkable  = (getFile8Bit(file) == 1 ? TRUE : FALSE);
-  level->grow_into_diggable    = (getFile8Bit(file) == 1 ? TRUE : FALSE);
+    getFileChunkBE(file, chunk_name, NULL);
+    if (!strEqual(chunk_name, "CAVE"))
+    {
+      level->no_valid_file = TRUE;
 
-  level->game_engine_type      = getFile8Bit(file);
+      Error(ERR_WARN, "unknown format of level file '%s'", filename);
 
-  ReadUnusedBytesFromFile(file, LEVEL_CHUNK_HEAD_UNUSED);
+      closeFile(file);
 
-  return chunk_size;
-}
+      return;
+    }
+  }
+  else /* check for pre-2.0 file format with cookie string */
+  {
+    strcpy(cookie, chunk_name);
+    if (getStringFromFile(file, &cookie[4], MAX_LINE_LEN - 4) == NULL)
+      cookie[4] = '\0';
+    if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
+      cookie[strlen(cookie) - 1] = '\0';
 
-static int LoadLevel_NAME(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int i;
+    if (!checkCookieString(cookie, LEVEL_COOKIE_TMPL))
+    {
+      level->no_valid_file = TRUE;
 
-  for (i = 0; i < MAX_LEVEL_NAME_LEN; i++)
-    level->name[i] = getFile8Bit(file);
-  level->name[MAX_LEVEL_NAME_LEN] = 0;
+      Error(ERR_WARN, "unknown format of level file '%s'", filename);
 
-  return chunk_size;
-}
+      closeFile(file);
 
-static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int i;
+      return;
+    }
 
-  for (i = 0; i < MAX_LEVEL_AUTHOR_LEN; i++)
-    level->author[i] = getFile8Bit(file);
-  level->author[MAX_LEVEL_AUTHOR_LEN] = 0;
+    if ((level->file_version = getFileVersionFromCookieString(cookie)) == -1)
+    {
+      level->no_valid_file = TRUE;
 
-  return chunk_size;
-}
+      Error(ERR_WARN, "unsupported version of level file '%s'", filename);
 
-static int LoadLevel_BODY(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int x, y;
-  int chunk_size_expected = level->fieldx * level->fieldy;
+      closeFile(file);
 
-  /* Note: "chunk_size" was wrong before version 2.0 when elements are
-     stored with 16-bit encoding (and should be twice as big then).
-     Even worse, playfield data was stored 16-bit when only yamyam content
-     contained 16-bit elements and vice versa. */
+      return;
+    }
 
-  if (level->encoding_16bit_field && level->file_version >= FILE_VERSION_2_0)
-    chunk_size_expected *= 2;
+    /* pre-2.0 level files have no game version, so use file version here */
+    level->game_version = level->file_version;
+  }
 
-  if (chunk_size_expected != chunk_size)
+  if (level->file_version < FILE_VERSION_1_2)
   {
-    ReadUnusedBytesFromFile(file, chunk_size);
-    return chunk_size_expected;
-  }
-
-  for (y = 0; y < level->fieldy; y++)
-    for (x = 0; x < level->fieldx; x++)
-      level->field[x][y] =
-       getMappedElement(level->encoding_16bit_field ? getFile16BitBE(file) :
-                        getFile8Bit(file));
-  return chunk_size;
-}
-
-static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int i, x, y;
-  int header_size = 4;
-  int content_size = MAX_ELEMENT_CONTENTS * 3 * 3;
-  int chunk_size_expected = header_size + content_size;
-
-  /* Note: "chunk_size" was wrong before version 2.0 when elements are
-     stored with 16-bit encoding (and should be twice as big then).
-     Even worse, playfield data was stored 16-bit when only yamyam content
-     contained 16-bit elements and vice versa. */
-
-  if (level->encoding_16bit_field && level->file_version >= FILE_VERSION_2_0)
-    chunk_size_expected += content_size;
-
-  if (chunk_size_expected != chunk_size)
-  {
-    ReadUnusedBytesFromFile(file, chunk_size);
-    return chunk_size_expected;
-  }
-
-  getFile8Bit(file);
-  level->num_yamyam_contents = getFile8Bit(file);
-  getFile8Bit(file);
-  getFile8Bit(file);
-
-  /* correct invalid number of content fields -- should never happen */
-  if (level->num_yamyam_contents < 1 ||
-      level->num_yamyam_contents > MAX_ELEMENT_CONTENTS)
-    level->num_yamyam_contents = STD_ELEMENT_CONTENTS;
-
-  for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
-    for (y = 0; y < 3; y++)
-      for (x = 0; x < 3; x++)
-       level->yamyam_content[i].e[x][y] =
-         getMappedElement(level->encoding_16bit_field ?
-                          getFile16BitBE(file) : getFile8Bit(file));
-  return chunk_size;
-}
-
-static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int i, x, y;
-  int element;
-  int num_contents;
-#if 0
-  int content_xsize, content_ysize;
-#endif
-  int content_array[MAX_ELEMENT_CONTENTS][3][3];
-
-  element = getMappedElement(getFile16BitBE(file));
-  num_contents = getFile8Bit(file);
-#if 1
-  getFile8Bit(file);   /* content x size (unused) */
-  getFile8Bit(file);   /* content y size (unused) */
-#else
-  content_xsize = getFile8Bit(file);
-  content_ysize = getFile8Bit(file);
-#endif
-
-  ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT2_UNUSED);
-
-  for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
-    for (y = 0; y < 3; y++)
-      for (x = 0; x < 3; x++)
-       content_array[i][x][y] = getMappedElement(getFile16BitBE(file));
-
-  /* correct invalid number of content fields -- should never happen */
-  if (num_contents < 1 || num_contents > MAX_ELEMENT_CONTENTS)
-    num_contents = STD_ELEMENT_CONTENTS;
-
-  if (element == EL_YAMYAM)
-  {
-    level->num_yamyam_contents = num_contents;
-
-    for (i = 0; i < num_contents; i++)
-      for (y = 0; y < 3; y++)
-       for (x = 0; x < 3; x++)
-         level->yamyam_content[i].e[x][y] = content_array[i][x][y];
-  }
-  else if (element == EL_BD_AMOEBA)
-  {
-    level->amoeba_content = content_array[0][0][0];
-  }
-  else
-  {
-    Error(ERR_WARN, "cannot load content for element '%d'", element);
-  }
-
-  return chunk_size;
-}
-
-static int LoadLevel_CNT3(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int i;
-  int element;
-  int envelope_nr;
-  int envelope_len;
-  int chunk_size_expected;
-
-  element = getMappedElement(getFile16BitBE(file));
-  if (!IS_ENVELOPE(element))
-    element = EL_ENVELOPE_1;
-
-  envelope_nr = element - EL_ENVELOPE_1;
-
-  envelope_len = getFile16BitBE(file);
-
-  level->envelope[envelope_nr].xsize = getFile8Bit(file);
-  level->envelope[envelope_nr].ysize = getFile8Bit(file);
-
-  ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT3_UNUSED);
-
-  chunk_size_expected = LEVEL_CHUNK_CNT3_SIZE(envelope_len);
-  if (chunk_size_expected != chunk_size)
-  {
-    ReadUnusedBytesFromFile(file, chunk_size - LEVEL_CHUNK_CNT3_HEADER);
-    return chunk_size_expected;
-  }
-
-  for (i = 0; i < envelope_len; i++)
-    level->envelope[envelope_nr].text[i] = getFile8Bit(file);
-
-  return chunk_size;
-}
-
-static int LoadLevel_CUS1(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int num_changed_custom_elements = getFile16BitBE(file);
-  int chunk_size_expected = 2 + num_changed_custom_elements * 6;
-  int i;
-
-  if (chunk_size_expected != chunk_size)
-  {
-    ReadUnusedBytesFromFile(file, chunk_size - 2);
-    return chunk_size_expected;
-  }
-
-  for (i = 0; i < num_changed_custom_elements; i++)
-  {
-    int element = getMappedElement(getFile16BitBE(file));
-    int properties = getFile32BitBE(file);
-
-    if (IS_CUSTOM_ELEMENT(element))
-      element_info[element].properties[EP_BITFIELD_BASE_NR] = properties;
-    else
-      Error(ERR_WARN, "invalid custom element number %d", element);
-
-    /* older game versions that wrote level files with CUS1 chunks used
-       different default push delay values (not yet stored in level file) */
-    element_info[element].push_delay_fixed = 2;
-    element_info[element].push_delay_random = 8;
-  }
-
-  return chunk_size;
-}
-
-static int LoadLevel_CUS2(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int num_changed_custom_elements = getFile16BitBE(file);
-  int chunk_size_expected = 2 + num_changed_custom_elements * 4;
-  int i;
-
-  if (chunk_size_expected != chunk_size)
-  {
-    ReadUnusedBytesFromFile(file, chunk_size - 2);
-    return chunk_size_expected;
-  }
-
-  for (i = 0; i < num_changed_custom_elements; i++)
-  {
-    int element = getMappedElement(getFile16BitBE(file));
-    int custom_target_element = getMappedElement(getFile16BitBE(file));
-
-    if (IS_CUSTOM_ELEMENT(element))
-      element_info[element].change->target_element = custom_target_element;
-    else
-      Error(ERR_WARN, "invalid custom element number %d", element);
-  }
-
-  return chunk_size;
-}
-
-static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int num_changed_custom_elements = getFile16BitBE(file);
-  int chunk_size_expected = LEVEL_CHUNK_CUS3_SIZE(num_changed_custom_elements);
-  int i, j, x, y;
-
-  if (chunk_size_expected != chunk_size)
-  {
-    ReadUnusedBytesFromFile(file, chunk_size - 2);
-    return chunk_size_expected;
-  }
-
-  for (i = 0; i < num_changed_custom_elements; i++)
-  {
-    int element = getMappedElement(getFile16BitBE(file));
-    struct ElementInfo *ei = &element_info[element];
-    unsigned int event_bits;
-
-    if (!IS_CUSTOM_ELEMENT(element))
-    {
-      Error(ERR_WARN, "invalid custom element number %d", element);
-
-      element = EL_INTERNAL_DUMMY;
-    }
-
-    for (j = 0; j < MAX_ELEMENT_NAME_LEN; j++)
-      ei->description[j] = getFile8Bit(file);
-    ei->description[MAX_ELEMENT_NAME_LEN] = 0;
-
-    ei->properties[EP_BITFIELD_BASE_NR] = getFile32BitBE(file);
-
-    /* some free bytes for future properties and padding */
-    ReadUnusedBytesFromFile(file, 7);
-
-    ei->use_gfx_element = getFile8Bit(file);
-    ei->gfx_element_initial = getMappedElement(getFile16BitBE(file));
-
-    ei->collect_score_initial = getFile8Bit(file);
-    ei->collect_count_initial = getFile8Bit(file);
-
-    ei->push_delay_fixed = getFile16BitBE(file);
-    ei->push_delay_random = getFile16BitBE(file);
-    ei->move_delay_fixed = getFile16BitBE(file);
-    ei->move_delay_random = getFile16BitBE(file);
-
-    ei->move_pattern = getFile16BitBE(file);
-    ei->move_direction_initial = getFile8Bit(file);
-    ei->move_stepsize = getFile8Bit(file);
-
-    for (y = 0; y < 3; y++)
-      for (x = 0; x < 3; x++)
-       ei->content.e[x][y] = getMappedElement(getFile16BitBE(file));
-
-    event_bits = getFile32BitBE(file);
-    for (j = 0; j < NUM_CHANGE_EVENTS; j++)
-      if (event_bits & (1 << j))
-       ei->change->has_event[j] = TRUE;
-
-    ei->change->target_element = getMappedElement(getFile16BitBE(file));
-
-    ei->change->delay_fixed = getFile16BitBE(file);
-    ei->change->delay_random = getFile16BitBE(file);
-    ei->change->delay_frames = getFile16BitBE(file);
-
-    ei->change->initial_trigger_element= getMappedElement(getFile16BitBE(file));
-
-    ei->change->explode = getFile8Bit(file);
-    ei->change->use_target_content = getFile8Bit(file);
-    ei->change->only_if_complete = getFile8Bit(file);
-    ei->change->use_random_replace = getFile8Bit(file);
-
-    ei->change->random_percentage = getFile8Bit(file);
-    ei->change->replace_when = getFile8Bit(file);
-
-    for (y = 0; y < 3; y++)
-      for (x = 0; x < 3; x++)
-       ei->change->target_content.e[x][y] =
-         getMappedElement(getFile16BitBE(file));
-
-    ei->slippery_type = getFile8Bit(file);
-
-    /* some free bytes for future properties and padding */
-    ReadUnusedBytesFromFile(file, LEVEL_CPART_CUS3_UNUSED);
-
-    /* mark that this custom element has been modified */
-    ei->modified_settings = TRUE;
-  }
-
-  return chunk_size;
-}
-
-static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  struct ElementInfo *ei;
-  int chunk_size_expected;
-  int element;
-  int i, j, x, y;
-
-  /* ---------- custom element base property values (96 bytes) ------------- */
-
-  element = getMappedElement(getFile16BitBE(file));
-
-  if (!IS_CUSTOM_ELEMENT(element))
-  {
-    Error(ERR_WARN, "invalid custom element number %d", element);
-
-    ReadUnusedBytesFromFile(file, chunk_size - 2);
-    return chunk_size;
-  }
-
-  ei = &element_info[element];
-
-  for (i = 0; i < MAX_ELEMENT_NAME_LEN; i++)
-    ei->description[i] = getFile8Bit(file);
-  ei->description[MAX_ELEMENT_NAME_LEN] = 0;
-
-  ei->properties[EP_BITFIELD_BASE_NR] = getFile32BitBE(file);
-
-  ReadUnusedBytesFromFile(file, 4);    /* reserved for more base properties */
-
-  ei->num_change_pages = getFile8Bit(file);
-
-  chunk_size_expected = LEVEL_CHUNK_CUS4_SIZE(ei->num_change_pages);
-  if (chunk_size_expected != chunk_size)
-  {
-    ReadUnusedBytesFromFile(file, chunk_size - 43);
-    return chunk_size_expected;
-  }
-
-  ei->ce_value_fixed_initial = getFile16BitBE(file);
-  ei->ce_value_random_initial = getFile16BitBE(file);
-  ei->use_last_ce_value = getFile8Bit(file);
-
-  ei->use_gfx_element = getFile8Bit(file);
-  ei->gfx_element_initial = getMappedElement(getFile16BitBE(file));
-
-  ei->collect_score_initial = getFile8Bit(file);
-  ei->collect_count_initial = getFile8Bit(file);
-
-  ei->drop_delay_fixed = getFile8Bit(file);
-  ei->push_delay_fixed = getFile8Bit(file);
-  ei->drop_delay_random = getFile8Bit(file);
-  ei->push_delay_random = getFile8Bit(file);
-  ei->move_delay_fixed = getFile16BitBE(file);
-  ei->move_delay_random = getFile16BitBE(file);
-
-  /* bits 0 - 15 of "move_pattern" ... */
-  ei->move_pattern = getFile16BitBE(file);
-  ei->move_direction_initial = getFile8Bit(file);
-  ei->move_stepsize = getFile8Bit(file);
-
-  ei->slippery_type = getFile8Bit(file);
-
-  for (y = 0; y < 3; y++)
-    for (x = 0; x < 3; x++)
-      ei->content.e[x][y] = getMappedElement(getFile16BitBE(file));
-
-  ei->move_enter_element = getMappedElement(getFile16BitBE(file));
-  ei->move_leave_element = getMappedElement(getFile16BitBE(file));
-  ei->move_leave_type = getFile8Bit(file);
-
-  /* ... bits 16 - 31 of "move_pattern" (not nice, but downward compatible) */
-  ei->move_pattern |= (getFile16BitBE(file) << 16);
-
-  ei->access_direction = getFile8Bit(file);
-
-  ei->explosion_delay = getFile8Bit(file);
-  ei->ignition_delay = getFile8Bit(file);
-  ei->explosion_type = getFile8Bit(file);
-
-  /* some free bytes for future custom property values and padding */
-  ReadUnusedBytesFromFile(file, 1);
-
-  /* ---------- change page property values (48 bytes) --------------------- */
-
-  setElementChangePages(ei, ei->num_change_pages);
-
-  for (i = 0; i < ei->num_change_pages; i++)
-  {
-    struct ElementChangeInfo *change = &ei->change_page[i];
-    unsigned int event_bits;
-
-    /* always start with reliable default values */
-    setElementChangeInfoToDefaults(change);
-
-    /* bits 0 - 31 of "has_event[]" ... */
-    event_bits = getFile32BitBE(file);
-    for (j = 0; j < MIN(NUM_CHANGE_EVENTS, 32); j++)
-      if (event_bits & (1 << j))
-       change->has_event[j] = TRUE;
-
-    change->target_element = getMappedElement(getFile16BitBE(file));
-
-    change->delay_fixed = getFile16BitBE(file);
-    change->delay_random = getFile16BitBE(file);
-    change->delay_frames = getFile16BitBE(file);
-
-    change->initial_trigger_element = getMappedElement(getFile16BitBE(file));
-
-    change->explode = getFile8Bit(file);
-    change->use_target_content = getFile8Bit(file);
-    change->only_if_complete = getFile8Bit(file);
-    change->use_random_replace = getFile8Bit(file);
-
-    change->random_percentage = getFile8Bit(file);
-    change->replace_when = getFile8Bit(file);
-
-    for (y = 0; y < 3; y++)
-      for (x = 0; x < 3; x++)
-       change->target_content.e[x][y]= getMappedElement(getFile16BitBE(file));
-
-    change->can_change = getFile8Bit(file);
-
-    change->trigger_side = getFile8Bit(file);
-
-    change->trigger_player = getFile8Bit(file);
-    change->trigger_page = getFile8Bit(file);
-
-    change->trigger_page = (change->trigger_page == CH_PAGE_ANY_FILE ?
-                           CH_PAGE_ANY : (1 << change->trigger_page));
-
-    change->has_action = getFile8Bit(file);
-    change->action_type = getFile8Bit(file);
-    change->action_mode = getFile8Bit(file);
-    change->action_arg = getFile16BitBE(file);
-
-    /* ... bits 32 - 39 of "has_event[]" (not nice, but downward compatible) */
-    event_bits = getFile8Bit(file);
-    for (j = 32; j < NUM_CHANGE_EVENTS; j++)
-      if (event_bits & (1 << (j - 32)))
-       change->has_event[j] = TRUE;
-  }
-
-  /* mark this custom element as modified */
-  ei->modified_settings = TRUE;
-
-  return chunk_size;
-}
-
-static int LoadLevel_GRP1(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  struct ElementInfo *ei;
-  struct ElementGroupInfo *group;
-  int element;
-  int i;
-
-  element = getMappedElement(getFile16BitBE(file));
-
-  if (!IS_GROUP_ELEMENT(element))
-  {
-    Error(ERR_WARN, "invalid group element number %d", element);
-
-    ReadUnusedBytesFromFile(file, chunk_size - 2);
-    return chunk_size;
-  }
-
-  ei = &element_info[element];
-
-  for (i = 0; i < MAX_ELEMENT_NAME_LEN; i++)
-    ei->description[i] = getFile8Bit(file);
-  ei->description[MAX_ELEMENT_NAME_LEN] = 0;
-
-  group = element_info[element].group;
-
-  group->num_elements = getFile8Bit(file);
-
-  ei->use_gfx_element = getFile8Bit(file);
-  ei->gfx_element_initial = getMappedElement(getFile16BitBE(file));
-
-  group->choice_mode = getFile8Bit(file);
-
-  /* some free bytes for future values and padding */
-  ReadUnusedBytesFromFile(file, 3);
-
-  for (i = 0; i < MAX_ELEMENTS_IN_GROUP; i++)
-    group->element[i] = getMappedElement(getFile16BitBE(file));
-
-  /* mark this group element as modified */
-  element_info[element].modified_settings = TRUE;
-
-  return chunk_size;
-}
-
-static int LoadLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *conf,
-                               int element, int real_element)
-{
-  int micro_chunk_size = 0;
-  int conf_type = getFile8Bit(file);
-  int byte_mask = conf_type & CONF_MASK_BYTES;
-  boolean element_found = FALSE;
-  int i;
-
-  micro_chunk_size += 1;
-
-  if (byte_mask == CONF_MASK_MULTI_BYTES)
-  {
-    int num_bytes = getFile16BitBE(file);
-    byte *buffer = checked_malloc(num_bytes);
-
-    ReadBytesFromFile(file, buffer, num_bytes);
-
-    for (i = 0; conf[i].data_type != -1; i++)
-    {
-      if (conf[i].element == element &&
-         conf[i].conf_type == conf_type)
-      {
-       int data_type = conf[i].data_type;
-       int num_entities = num_bytes / CONF_ENTITY_NUM_BYTES(data_type);
-       int max_num_entities = conf[i].max_num_entities;
-
-       if (num_entities > max_num_entities)
-       {
-         Error(ERR_WARN,
-               "truncating number of entities for element %d from %d to %d",
-               element, num_entities, max_num_entities);
-
-         num_entities = max_num_entities;
-       }
-
-       if (num_entities == 0 && (data_type == TYPE_ELEMENT_LIST ||
-                                 data_type == TYPE_CONTENT_LIST))
-       {
-         /* for element and content lists, zero entities are not allowed */
-         Error(ERR_WARN, "found empty list of entities for element %d",
-               element);
-
-         /* do not set "num_entities" here to prevent reading behind buffer */
-
-         *(int *)(conf[i].num_entities) = 1;   /* at least one is required */
-       }
-       else
-       {
-         *(int *)(conf[i].num_entities) = num_entities;
-       }
-
-       element_found = TRUE;
-
-       if (data_type == TYPE_STRING)
-       {
-         char *string = (char *)(conf[i].value);
-         int j;
-
-         for (j = 0; j < max_num_entities; j++)
-           string[j] = (j < num_entities ? buffer[j] : '\0');
-       }
-       else if (data_type == TYPE_ELEMENT_LIST)
-       {
-         int *element_array = (int *)(conf[i].value);
-         int j;
-
-         for (j = 0; j < num_entities; j++)
-           element_array[j] =
-             getMappedElement(CONF_ELEMENTS_ELEMENT(buffer, j));
-       }
-       else if (data_type == TYPE_CONTENT_LIST)
-       {
-         struct Content *content= (struct Content *)(conf[i].value);
-         int c, x, y;
-
-         for (c = 0; c < num_entities; c++)
-           for (y = 0; y < 3; y++)
-             for (x = 0; x < 3; x++)
-               content[c].e[x][y] =
-                 getMappedElement(CONF_CONTENTS_ELEMENT(buffer, c, x, y));
-       }
-       else
-         element_found = FALSE;
-
-       break;
-      }
-    }
-
-    checked_free(buffer);
-
-    micro_chunk_size += 2 + num_bytes;
-  }
-  else         /* constant size configuration data (1, 2 or 4 bytes) */
-  {
-    int value = (byte_mask == CONF_MASK_1_BYTE ? getFile8Bit   (file) :
-                byte_mask == CONF_MASK_2_BYTE ? getFile16BitBE(file) :
-                byte_mask == CONF_MASK_4_BYTE ? getFile32BitBE(file) : 0);
-
-    for (i = 0; conf[i].data_type != -1; i++)
-    {
-      if (conf[i].element == element &&
-         conf[i].conf_type == conf_type)
-      {
-       int data_type = conf[i].data_type;
-
-       if (data_type == TYPE_ELEMENT)
-         value = getMappedElement(value);
-
-       if (data_type == TYPE_BOOLEAN)
-         *(boolean *)(conf[i].value) = value;
-       else
-         *(int *)    (conf[i].value) = value;
-
-       element_found = TRUE;
-
-       break;
-      }
-    }
-
-    micro_chunk_size += CONF_VALUE_NUM_BYTES(byte_mask);
-  }
-
-  if (!element_found)
-  {
-    char *error_conf_chunk_bytes =
-      (byte_mask == CONF_MASK_1_BYTE ? "CONF_VALUE_8_BIT" :
-       byte_mask == CONF_MASK_2_BYTE ? "CONF_VALUE_16_BIT" :
-       byte_mask == CONF_MASK_4_BYTE ? "CONF_VALUE_32_BIT" :"CONF_VALUE_BYTES");
-    int error_conf_chunk_token = conf_type & CONF_MASK_TOKEN;
-    int error_element = real_element;
-
-    Error(ERR_WARN, "cannot load micro chunk '%s(%d)' value for element %d ['%s']",
-         error_conf_chunk_bytes, error_conf_chunk_token,
-         error_element, EL_NAME(error_element));
-  }
-
-  return micro_chunk_size;
-}
-
-static int LoadLevel_INFO(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int real_chunk_size = 0;
-
-  li = *level;         /* copy level data into temporary buffer */
-
-  while (!feof(file))
-  {
-    real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_INFO, -1, -1);
-
-    if (real_chunk_size >= chunk_size)
-      break;
-  }
-
-  *level = li;         /* copy temporary buffer back to level data */
-
-  return real_chunk_size;
-}
-
-static int LoadLevel_CONF(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int real_chunk_size = 0;
-
-  li = *level;         /* copy level data into temporary buffer */
-
-  while (!feof(file))
-  {
-    int element = getMappedElement(getFile16BitBE(file));
-
-    real_chunk_size += 2;
-    real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_CONF,
-                                           element, element);
-    if (real_chunk_size >= chunk_size)
-      break;
-  }
-
-  *level = li;         /* copy temporary buffer back to level data */
-
-  return real_chunk_size;
-}
-
-static int LoadLevel_ELEM(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int real_chunk_size = 0;
-
-  li = *level;         /* copy level data into temporary buffer */
-
-  while (!feof(file))
-  {
-    int element = getMappedElement(getFile16BitBE(file));
-
-    real_chunk_size += 2;
-    real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_ELEM,
-                                           element, element);
-    if (real_chunk_size >= chunk_size)
-      break;
-  }
-
-  *level = li;         /* copy temporary buffer back to level data */
-
-  return real_chunk_size;
-}
-
-static int LoadLevel_NOTE(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int element = getMappedElement(getFile16BitBE(file));
-  int envelope_nr = element - EL_ENVELOPE_1;
-  int real_chunk_size = 2;
-
-  while (!feof(file))
-  {
-    real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_NOTE,
-                                           -1, element);
-
-    if (real_chunk_size >= chunk_size)
-      break;
-  }
-
-  level->envelope[envelope_nr] = xx_envelope;
-
-  return real_chunk_size;
-}
-
-static int LoadLevel_CUSX(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int element = getMappedElement(getFile16BitBE(file));
-  int real_chunk_size = 2;
-  struct ElementInfo *ei = &element_info[element];
-  int i;
-
-  xx_ei = *ei;         /* copy element data into temporary buffer */
-
-  xx_ei.num_change_pages = -1;
-
-  while (!feof(file))
-  {
-    real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_CUSX_base,
-                                           -1, element);
-    if (xx_ei.num_change_pages != -1)
-      break;
-
-    if (real_chunk_size >= chunk_size)
-      break;
-  }
-
-  *ei = xx_ei;
-
-  if (ei->num_change_pages == -1)
-  {
-    Error(ERR_WARN, "LoadLevel_CUSX(): missing 'num_change_pages' for '%s'",
-         EL_NAME(element));
-
-    ei->num_change_pages = 1;
-
-    setElementChangePages(ei, 1);
-    setElementChangeInfoToDefaults(ei->change);
-
-    return real_chunk_size;
-  }
-
-  /* initialize number of change pages stored for this custom element */
-  setElementChangePages(ei, ei->num_change_pages);
-  for (i = 0; i < ei->num_change_pages; i++)
-    setElementChangeInfoToDefaults(&ei->change_page[i]);
-
-  /* start with reading properties for the first change page */
-  xx_current_change_page = 0;
-
-  while (!feof(file))
-  {
-    struct ElementChangeInfo *change = &ei->change_page[xx_current_change_page];
-
-    xx_change = *change;       /* copy change data into temporary buffer */
-
-    resetEventBits();          /* reset bits; change page might have changed */
-
-    real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_CUSX_change,
-                                           -1, element);
-
-    *change = xx_change;
-
-    setEventFlagsFromEventBits(change);
-
-    if (real_chunk_size >= chunk_size)
-      break;
-  }
-
-  return real_chunk_size;
-}
-
-static int LoadLevel_GRPX(FILE *file, int chunk_size, struct LevelInfo *level)
-{
-  int element = getMappedElement(getFile16BitBE(file));
-  int real_chunk_size = 2;
-  struct ElementInfo *ei = &element_info[element];
-  struct ElementGroupInfo *group = ei->group;
-
-  xx_ei = *ei;         /* copy element data into temporary buffer */
-  xx_group = *group;   /* copy group data into temporary buffer */
-
-  while (!feof(file))
-  {
-    real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_GRPX,
-                                           -1, element);
-
-    if (real_chunk_size >= chunk_size)
-      break;
-  }
-
-  *ei = xx_ei;
-  *group = xx_group;
-
-  return real_chunk_size;
-}
-
-#endif
-
-#if 1
-
-static void LoadLevelFromFileInfo_RND(struct LevelInfo *level,
-                                     struct LevelFileInfo *level_file_info,
-                                     boolean level_info_only)
-{
-  char *filename = level_file_info->filename;
-  char cookie[MAX_LINE_LEN];
-  char chunk_name[CHUNK_ID_LEN + 1];
-  int chunk_size;
-  File *file;
-
-  if (!(file = openFile(filename, MODE_READ)))
-  {
-    level->no_valid_file = TRUE;
-
-#if 1
-    if (!level_info_only)
-      Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
-#else
-    if (level != &level_template)
-      Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
-#endif
-
-    return;
-  }
-
-  getFileChunkBE(file, chunk_name, NULL);
-  if (strEqual(chunk_name, "RND1"))
-  {
-    getFile32BitBE(file);              /* not used */
-
-    getFileChunkBE(file, chunk_name, NULL);
-    if (!strEqual(chunk_name, "CAVE"))
-    {
-      level->no_valid_file = TRUE;
-
-      Error(ERR_WARN, "unknown format of level file '%s'", filename);
-
-      closeFile(file);
-
-      return;
-    }
-  }
-  else /* check for pre-2.0 file format with cookie string */
-  {
-    strcpy(cookie, chunk_name);
-    if (getStringFromFile(file, &cookie[4], MAX_LINE_LEN - 4) == NULL)
-      cookie[4] = '\0';
-    if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
-      cookie[strlen(cookie) - 1] = '\0';
-
-    if (!checkCookieString(cookie, LEVEL_COOKIE_TMPL))
-    {
-      level->no_valid_file = TRUE;
-
-      Error(ERR_WARN, "unknown format of level file '%s'", filename);
-
-      closeFile(file);
-
-      return;
-    }
-
-    if ((level->file_version = getFileVersionFromCookieString(cookie)) == -1)
-    {
-      level->no_valid_file = TRUE;
-
-      Error(ERR_WARN, "unsupported version of level file '%s'", filename);
-
-      closeFile(file);
-
-      return;
-    }
-
-    /* pre-2.0 level files have no game version, so use file version here */
-    level->game_version = level->file_version;
-  }
-
-  if (level->file_version < FILE_VERSION_1_2)
-  {
-    /* level files from versions before 1.2.0 without chunk structure */
-    LoadLevel_HEAD(file, LEVEL_CHUNK_HEAD_SIZE,         level);
-    LoadLevel_BODY(file, level->fieldx * level->fieldy, level);
-  }
-  else
-  {
-    static struct
-    {
-      char *name;
-      int size;
-      int (*loader)(File *, int, struct LevelInfo *);
-    }
-    chunk_info[] =
-    {
-      { "VERS", LEVEL_CHUNK_VERS_SIZE, LoadLevel_VERS },
-      { "DATE", LEVEL_CHUNK_DATE_SIZE, LoadLevel_DATE },
-      { "HEAD", LEVEL_CHUNK_HEAD_SIZE, LoadLevel_HEAD },
-      { "NAME", LEVEL_CHUNK_NAME_SIZE, LoadLevel_NAME },
-      { "AUTH", LEVEL_CHUNK_AUTH_SIZE, LoadLevel_AUTH },
-      { "INFO", -1,                    LoadLevel_INFO },
-      { "BODY", -1,                    LoadLevel_BODY },
-      { "CONT", -1,                    LoadLevel_CONT },
-      { "CNT2", LEVEL_CHUNK_CNT2_SIZE, LoadLevel_CNT2 },
-      { "CNT3", -1,                    LoadLevel_CNT3 },
-      { "CUS1", -1,                    LoadLevel_CUS1 },
-      { "CUS2", -1,                    LoadLevel_CUS2 },
-      { "CUS3", -1,                    LoadLevel_CUS3 },
-      { "CUS4", -1,                    LoadLevel_CUS4 },
-      { "GRP1", -1,                    LoadLevel_GRP1 },
-      { "CONF", -1,                    LoadLevel_CONF },
-      { "ELEM", -1,                    LoadLevel_ELEM },
-      { "NOTE", -1,                    LoadLevel_NOTE },
-      { "CUSX", -1,                    LoadLevel_CUSX },
-      { "GRPX", -1,                    LoadLevel_GRPX },
-
-      {  NULL,  0,                     NULL }
-    };
-
-    while (getFileChunkBE(file, chunk_name, &chunk_size))
-    {
-      int i = 0;
-
-      while (chunk_info[i].name != NULL &&
-            !strEqual(chunk_name, chunk_info[i].name))
-       i++;
-
-      if (chunk_info[i].name == NULL)
-      {
-       Error(ERR_WARN, "unknown chunk '%s' in level file '%s'",
-             chunk_name, filename);
-       ReadUnusedBytesFromFile(file, chunk_size);
-      }
-      else if (chunk_info[i].size != -1 &&
-              chunk_info[i].size != chunk_size)
-      {
-       Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'",
-             chunk_size, chunk_name, filename);
-       ReadUnusedBytesFromFile(file, chunk_size);
-      }
-      else
-      {
-       /* call function to load this level chunk */
-       int chunk_size_expected =
-         (chunk_info[i].loader)(file, chunk_size, level);
-
-       /* the size of some chunks cannot be checked before reading other
-          chunks first (like "HEAD" and "BODY") that contain some header
-          information, so check them here */
-       if (chunk_size_expected != chunk_size)
-       {
-         Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'",
-               chunk_size, chunk_name, filename);
-       }
-      }
-    }
-  }
-
-  closeFile(file);
-}
-
-#else
-
-static void LoadLevelFromFileInfo_RND(struct LevelInfo *level,
-                                     struct LevelFileInfo *level_file_info,
-                                     boolean level_info_only)
-{
-  char *filename = level_file_info->filename;
-  char cookie[MAX_LINE_LEN];
-  char chunk_name[CHUNK_ID_LEN + 1];
-  int chunk_size;
-  FILE *file;
-
-  if (!(file = fopen(filename, MODE_READ)))
-  {
-    level->no_valid_file = TRUE;
-
-#if 1
-    if (!level_info_only)
-      Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
-#else
-    if (level != &level_template)
-      Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
-#endif
-
-    return;
-  }
-
-  getFileChunkBE(file, chunk_name, NULL);
-  if (strEqual(chunk_name, "RND1"))
-  {
-    getFile32BitBE(file);              /* not used */
-
-    getFileChunkBE(file, chunk_name, NULL);
-    if (!strEqual(chunk_name, "CAVE"))
-    {
-      level->no_valid_file = TRUE;
-
-      Error(ERR_WARN, "unknown format of level file '%s'", filename);
-      fclose(file);
-      return;
-    }
-  }
-  else /* check for pre-2.0 file format with cookie string */
-  {
-    strcpy(cookie, chunk_name);
-    if (fgets(&cookie[4], MAX_LINE_LEN - 4, file) == NULL)
-      cookie[4] = '\0';
-    if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
-      cookie[strlen(cookie) - 1] = '\0';
-
-    if (!checkCookieString(cookie, LEVEL_COOKIE_TMPL))
-    {
-      level->no_valid_file = TRUE;
-
-      Error(ERR_WARN, "unknown format of level file '%s'", filename);
-      fclose(file);
-      return;
-    }
-
-    if ((level->file_version = getFileVersionFromCookieString(cookie)) == -1)
-    {
-      level->no_valid_file = TRUE;
-
-      Error(ERR_WARN, "unsupported version of level file '%s'", filename);
-      fclose(file);
-      return;
-    }
-
-    /* pre-2.0 level files have no game version, so use file version here */
-    level->game_version = level->file_version;
-  }
-
-  if (level->file_version < FILE_VERSION_1_2)
-  {
-    /* level files from versions before 1.2.0 without chunk structure */
-    LoadLevel_HEAD(file, LEVEL_CHUNK_HEAD_SIZE,         level);
-    LoadLevel_BODY(file, level->fieldx * level->fieldy, level);
-  }
-  else
-  {
-    static struct
-    {
-      char *name;
-      int size;
-      int (*loader)(FILE *, int, struct LevelInfo *);
-    }
-    chunk_info[] =
-    {
-      { "VERS", LEVEL_CHUNK_VERS_SIZE, LoadLevel_VERS },
-      { "DATE", LEVEL_CHUNK_DATE_SIZE, LoadLevel_DATE },
-      { "HEAD", LEVEL_CHUNK_HEAD_SIZE, LoadLevel_HEAD },
-      { "NAME", LEVEL_CHUNK_NAME_SIZE, LoadLevel_NAME },
-      { "AUTH", LEVEL_CHUNK_AUTH_SIZE, LoadLevel_AUTH },
-      { "INFO", -1,                    LoadLevel_INFO },
-      { "BODY", -1,                    LoadLevel_BODY },
-      { "CONT", -1,                    LoadLevel_CONT },
-      { "CNT2", LEVEL_CHUNK_CNT2_SIZE, LoadLevel_CNT2 },
-      { "CNT3", -1,                    LoadLevel_CNT3 },
-      { "CUS1", -1,                    LoadLevel_CUS1 },
-      { "CUS2", -1,                    LoadLevel_CUS2 },
-      { "CUS3", -1,                    LoadLevel_CUS3 },
-      { "CUS4", -1,                    LoadLevel_CUS4 },
-      { "GRP1", -1,                    LoadLevel_GRP1 },
-      { "CONF", -1,                    LoadLevel_CONF },
-      { "ELEM", -1,                    LoadLevel_ELEM },
-      { "NOTE", -1,                    LoadLevel_NOTE },
-      { "CUSX", -1,                    LoadLevel_CUSX },
-      { "GRPX", -1,                    LoadLevel_GRPX },
-
-      {  NULL,  0,                     NULL }
-    };
-
-    while (getFileChunkBE(file, chunk_name, &chunk_size))
-    {
-      int i = 0;
-
-      while (chunk_info[i].name != NULL &&
-            !strEqual(chunk_name, chunk_info[i].name))
-       i++;
-
-      if (chunk_info[i].name == NULL)
-      {
-       Error(ERR_WARN, "unknown chunk '%s' in level file '%s'",
-             chunk_name, filename);
-       ReadUnusedBytesFromFile(file, chunk_size);
-      }
-      else if (chunk_info[i].size != -1 &&
-              chunk_info[i].size != chunk_size)
-      {
-       Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'",
-             chunk_size, chunk_name, filename);
-       ReadUnusedBytesFromFile(file, chunk_size);
-      }
-      else
-      {
-       /* call function to load this level chunk */
-       int chunk_size_expected =
-         (chunk_info[i].loader)(file, chunk_size, level);
-
-       /* the size of some chunks cannot be checked before reading other
-          chunks first (like "HEAD" and "BODY") that contain some header
-          information, so check them here */
-       if (chunk_size_expected != chunk_size)
-       {
-         Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'",
-               chunk_size, chunk_name, filename);
-       }
-      }
-    }
-  }
-
-  fclose(file);
-}
-
-#endif
-
-
-/* ------------------------------------------------------------------------- */
-/* functions for loading EM level                                            */
-/* ------------------------------------------------------------------------- */
-
-#if 0
-
-static int map_em_element_yam(int element)
-{
-  switch (element)
-  {
-    case 0x00: return EL_EMPTY;
-    case 0x01: return EL_EMERALD;
-    case 0x02: return EL_DIAMOND;
-    case 0x03: return EL_ROCK;
-    case 0x04: return EL_ROBOT;
-    case 0x05: return EL_SPACESHIP_UP;
-    case 0x06: return EL_BOMB;
-    case 0x07: return EL_BUG_UP;
-    case 0x08: return EL_AMOEBA_DROP;
-    case 0x09: return EL_NUT;
-    case 0x0a: return EL_YAMYAM;
-    case 0x0b: return EL_QUICKSAND_FULL;
-    case 0x0c: return EL_SAND;
-    case 0x0d: return EL_WALL_SLIPPERY;
-    case 0x0e: return EL_STEELWALL;
-    case 0x0f: return EL_WALL;
-    case 0x10: return EL_EM_KEY_1;
-    case 0x11: return EL_EM_KEY_2;
-    case 0x12: return EL_EM_KEY_4;
-    case 0x13: return EL_EM_KEY_3;
-    case 0x14: return EL_MAGIC_WALL;
-    case 0x15: return EL_ROBOT_WHEEL;
-    case 0x16: return EL_DYNAMITE;
-
-    case 0x17: return EL_EM_KEY_1;                     /* EMC */
-    case 0x18: return EL_BUG_UP;                       /* EMC */
-    case 0x1a: return EL_DIAMOND;                      /* EMC */
-    case 0x1b: return EL_EMERALD;                      /* EMC */
-    case 0x25: return EL_NUT;                          /* EMC */
-    case 0x80: return EL_EMPTY;                        /* EMC */
-    case 0x85: return EL_EM_KEY_1;                     /* EMC */
-    case 0x86: return EL_EM_KEY_2;                     /* EMC */
-    case 0x87: return EL_EM_KEY_4;                     /* EMC */
-    case 0x88: return EL_EM_KEY_3;                     /* EMC */
-    case 0x94: return EL_QUICKSAND_EMPTY;              /* EMC */
-    case 0x9a: return EL_AMOEBA_WET;                   /* EMC */
-    case 0xaf: return EL_DYNAMITE;                     /* EMC */
-    case 0xbd: return EL_SAND;                         /* EMC */
-
-    default:
-      Error(ERR_WARN, "invalid level element %d", element);
-      return EL_UNKNOWN;
-  }
-}
-
-static int map_em_element_field(int element)
-{
-  if (element >= 0xc8 && element <= 0xe1)
-    return EL_CHAR_A + (element - 0xc8);
-  else if (element >= 0xe2 && element <= 0xeb)
-    return EL_CHAR_0 + (element - 0xe2);
-
-  switch (element)
-  {
-    case 0x00: return EL_ROCK;
-    case 0x01: return EL_ROCK;                         /* EMC */
-    case 0x02: return EL_DIAMOND;
-    case 0x03: return EL_DIAMOND;
-    case 0x04: return EL_ROBOT;
-    case 0x05: return EL_ROBOT;                        /* EMC */
-    case 0x06: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x07: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x08: return EL_SPACESHIP_UP;
-    case 0x09: return EL_SPACESHIP_RIGHT;
-    case 0x0a: return EL_SPACESHIP_DOWN;
-    case 0x0b: return EL_SPACESHIP_LEFT;
-    case 0x0c: return EL_SPACESHIP_UP;
-    case 0x0d: return EL_SPACESHIP_RIGHT;
-    case 0x0e: return EL_SPACESHIP_DOWN;
-    case 0x0f: return EL_SPACESHIP_LEFT;
-
-    case 0x10: return EL_BOMB;
-    case 0x11: return EL_BOMB;                         /* EMC */
-    case 0x12: return EL_EMERALD;
-    case 0x13: return EL_EMERALD;
-    case 0x14: return EL_BUG_UP;
-    case 0x15: return EL_BUG_RIGHT;
-    case 0x16: return EL_BUG_DOWN;
-    case 0x17: return EL_BUG_LEFT;
-    case 0x18: return EL_BUG_UP;
-    case 0x19: return EL_BUG_RIGHT;
-    case 0x1a: return EL_BUG_DOWN;
-    case 0x1b: return EL_BUG_LEFT;
-    case 0x1c: return EL_AMOEBA_DROP;
-    case 0x1d: return EL_AMOEBA_DROP;                  /* EMC */
-    case 0x1e: return EL_AMOEBA_DROP;                  /* EMC */
-    case 0x1f: return EL_AMOEBA_DROP;                  /* EMC */
-
-    case 0x20: return EL_ROCK;
-    case 0x21: return EL_BOMB;                         /* EMC */
-    case 0x22: return EL_DIAMOND;                      /* EMC */
-    case 0x23: return EL_EMERALD;                      /* EMC */
-    case 0x24: return EL_MAGIC_WALL;
-    case 0x25: return EL_NUT;
-    case 0x26: return EL_NUT;                          /* EMC */
-    case 0x27: return EL_NUT;                          /* EMC */
-
-      /* looks like magic wheel, but is _always_ activated */
-    case 0x28: return EL_ROBOT_WHEEL;                  /* EMC */
-
-    case 0x29: return EL_YAMYAM;       /* up */
-    case 0x2a: return EL_YAMYAM;       /* down */
-    case 0x2b: return EL_YAMYAM;       /* left */      /* EMC */
-    case 0x2c: return EL_YAMYAM;       /* right */     /* EMC */
-    case 0x2d: return EL_QUICKSAND_FULL;
-    case 0x2e: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x2f: return EL_EMPTY_SPACE;                  /* EMC */
-
-    case 0x30: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x31: return EL_SAND;                         /* EMC */
-    case 0x32: return EL_SAND;                         /* EMC */
-    case 0x33: return EL_SAND;                         /* EMC */
-    case 0x34: return EL_QUICKSAND_FULL;               /* EMC */
-    case 0x35: return EL_QUICKSAND_FULL;               /* EMC */
-    case 0x36: return EL_QUICKSAND_FULL;               /* EMC */
-    case 0x37: return EL_SAND;                         /* EMC */
-    case 0x38: return EL_ROCK;                         /* EMC */
-    case 0x39: return EL_EXPANDABLE_WALL_HORIZONTAL;   /* EMC */
-    case 0x3a: return EL_EXPANDABLE_WALL_VERTICAL;     /* EMC */
-    case 0x3b: return EL_DYNAMITE_ACTIVE;      /* 1 */
-    case 0x3c: return EL_DYNAMITE_ACTIVE;      /* 2 */
-    case 0x3d: return EL_DYNAMITE_ACTIVE;      /* 3 */
-    case 0x3e: return EL_DYNAMITE_ACTIVE;      /* 4 */
-    case 0x3f: return EL_ACID_POOL_BOTTOM;
-
-    case 0x40: return EL_EXIT_OPEN;    /* 1 */
-    case 0x41: return EL_EXIT_OPEN;    /* 2 */
-    case 0x42: return EL_EXIT_OPEN;    /* 3 */
-    case 0x43: return EL_BALLOON;                      /* EMC */
-    case 0x44: return EL_UNKNOWN;                      /* EMC ("plant") */
-    case 0x45: return EL_SPRING;                       /* EMC */
-    case 0x46: return EL_SPRING;       /* falling */   /* EMC */
-    case 0x47: return EL_SPRING;       /* left */      /* EMC */
-    case 0x48: return EL_SPRING;       /* right */     /* EMC */
-    case 0x49: return EL_UNKNOWN;                      /* EMC ("ball 1") */
-    case 0x4a: return EL_UNKNOWN;                      /* EMC ("ball 2") */
-    case 0x4b: return EL_UNKNOWN;                      /* EMC ("android") */
-    case 0x4c: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x4d: return EL_UNKNOWN;                      /* EMC ("android") */
-    case 0x4e: return EL_INVISIBLE_WALL;               /* EMC (? "android") */
-    case 0x4f: return EL_UNKNOWN;                      /* EMC ("android") */
-
-    case 0x50: return EL_UNKNOWN;                      /* EMC ("android") */
-    case 0x51: return EL_UNKNOWN;                      /* EMC ("android") */
-    case 0x52: return EL_UNKNOWN;                      /* EMC ("android") */
-    case 0x53: return EL_UNKNOWN;                      /* EMC ("android") */
-    case 0x54: return EL_UNKNOWN;                      /* EMC ("android") */
-    case 0x55: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x56: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x57: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x58: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x59: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x5a: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x5b: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x5c: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x5d: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x5e: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x5f: return EL_EMPTY_SPACE;                  /* EMC */
-
-    case 0x60: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x61: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x62: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x63: return EL_SPRING;       /* left */      /* EMC */
-    case 0x64: return EL_SPRING;       /* right */     /* EMC */
-    case 0x65: return EL_ACID;         /* 1 */         /* EMC */
-    case 0x66: return EL_ACID;         /* 2 */         /* EMC */
-    case 0x67: return EL_ACID;         /* 3 */         /* EMC */
-    case 0x68: return EL_ACID;         /* 4 */         /* EMC */
-    case 0x69: return EL_ACID;         /* 5 */         /* EMC */
-    case 0x6a: return EL_ACID;         /* 6 */         /* EMC */
-    case 0x6b: return EL_ACID;         /* 7 */         /* EMC */
-    case 0x6c: return EL_ACID;         /* 8 */         /* EMC */
-    case 0x6d: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x6e: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x6f: return EL_EMPTY_SPACE;                  /* EMC */
-
-    case 0x70: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x71: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x72: return EL_NUT;          /* left */      /* EMC */
-    case 0x73: return EL_SAND;                         /* EMC (? "nut") */
-    case 0x74: return EL_STEELWALL;
-    case 0x75: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x76: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x77: return EL_BOMB;         /* left */      /* EMC */
-    case 0x78: return EL_BOMB;         /* right */     /* EMC */
-    case 0x79: return EL_ROCK;         /* left */      /* EMC */
-    case 0x7a: return EL_ROCK;         /* right */     /* EMC */
-    case 0x7b: return EL_ACID;                         /* (? EMC "blank") */
-    case 0x7c: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x7d: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x7e: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0x7f: return EL_EMPTY_SPACE;                  /* EMC */
-
-    case 0x80: return EL_EMPTY;
-    case 0x81: return EL_WALL_SLIPPERY;
-    case 0x82: return EL_SAND;
-    case 0x83: return EL_STEELWALL;
-    case 0x84: return EL_WALL;
-    case 0x85: return EL_EM_KEY_1;
-    case 0x86: return EL_EM_KEY_2;
-    case 0x87: return EL_EM_KEY_4;
-    case 0x88: return EL_EM_KEY_3;
-    case 0x89: return EL_EM_GATE_1;
-    case 0x8a: return EL_EM_GATE_2;
-    case 0x8b: return EL_EM_GATE_4;
-    case 0x8c: return EL_EM_GATE_3;
-    case 0x8d: return EL_INVISIBLE_WALL;               /* EMC (? "dripper") */
-    case 0x8e: return EL_EM_GATE_1_GRAY;
-    case 0x8f: return EL_EM_GATE_2_GRAY;
-
-    case 0x90: return EL_EM_GATE_4_GRAY;
-    case 0x91: return EL_EM_GATE_3_GRAY;
-    case 0x92: return EL_MAGIC_WALL;
-    case 0x93: return EL_ROBOT_WHEEL;
-    case 0x94: return EL_QUICKSAND_EMPTY;              /* (? EMC "sand") */
-    case 0x95: return EL_ACID_POOL_TOPLEFT;
-    case 0x96: return EL_ACID_POOL_TOPRIGHT;
-    case 0x97: return EL_ACID_POOL_BOTTOMLEFT;
-    case 0x98: return EL_ACID_POOL_BOTTOMRIGHT;
-    case 0x99: return EL_ACID;                 /* (? EMC "fake blank") */
-    case 0x9a: return EL_AMOEBA_DEAD;          /* 1 */
-    case 0x9b: return EL_AMOEBA_DEAD;          /* 2 */
-    case 0x9c: return EL_AMOEBA_DEAD;          /* 3 */
-    case 0x9d: return EL_AMOEBA_DEAD;          /* 4 */
-    case 0x9e: return EL_EXIT_CLOSED;
-    case 0x9f: return EL_CHAR_LESS;            /* arrow left */
-
-      /* looks like normal sand, but behaves like wall */
-    case 0xa0: return EL_UNKNOWN;              /* EMC ("fake grass") */
-    case 0xa1: return EL_UNKNOWN;              /* EMC ("lenses") */
-    case 0xa2: return EL_UNKNOWN;              /* EMC ("magnify") */
-    case 0xa3: return EL_UNKNOWN;              /* EMC ("fake blank") */
-    case 0xa4: return EL_UNKNOWN;              /* EMC ("fake grass") */
-    case 0xa5: return EL_UNKNOWN;              /* EMC ("switch") */
-    case 0xa6: return EL_UNKNOWN;              /* EMC ("switch") */
-    case 0xa7: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0xa8: return EL_EMC_WALL_1;                   /* EMC ("decor 8") */
-    case 0xa9: return EL_EMC_WALL_2;                   /* EMC ("decor 9") */
-    case 0xaa: return EL_EMC_WALL_3;                   /* EMC ("decor 10") */
-    case 0xab: return EL_EMC_WALL_7;                   /* EMC ("decor 5") */
-    case 0xac: return EL_CHAR_COMMA;                   /* EMC */
-    case 0xad: return EL_CHAR_QUOTEDBL;                /* EMC */
-    case 0xae: return EL_CHAR_MINUS;                   /* EMC */
-    case 0xaf: return EL_DYNAMITE;
-
-    case 0xb0: return EL_EMC_STEELWALL_1;              /* EMC ("steel 3") */
-    case 0xb1: return EL_EMC_WALL_8;                   /* EMC ("decor 6") */
-    case 0xb2: return EL_UNKNOWN;                      /* EMC ("decor 7") */
-    case 0xb3: return EL_STEELWALL;            /* 2 */ /* EMC */
-    case 0xb4: return EL_WALL_SLIPPERY;        /* 2 */ /* EMC */
-    case 0xb5: return EL_EMC_WALL_6;                   /* EMC ("decor 2") */
-    case 0xb6: return EL_EMC_WALL_5;                   /* EMC ("decor 4") */
-    case 0xb7: return EL_EMC_WALL_4;                   /* EMC ("decor 3") */
-    case 0xb8: return EL_BALLOON_SWITCH_ANY;           /* EMC */
-    case 0xb9: return EL_BALLOON_SWITCH_RIGHT;         /* EMC */
-    case 0xba: return EL_BALLOON_SWITCH_DOWN;          /* EMC */
-    case 0xbb: return EL_BALLOON_SWITCH_LEFT;          /* EMC */
-    case 0xbc: return EL_BALLOON_SWITCH_UP;            /* EMC */
-    case 0xbd: return EL_SAND;                         /* EMC ("dirt") */
-    case 0xbe: return EL_UNKNOWN;                      /* EMC ("plant") */
-    case 0xbf: return EL_UNKNOWN;                      /* EMC ("key 5") */
-
-    case 0xc0: return EL_UNKNOWN;                      /* EMC ("key 6") */
-    case 0xc1: return EL_UNKNOWN;                      /* EMC ("key 7") */
-    case 0xc2: return EL_UNKNOWN;                      /* EMC ("key 8") */
-    case 0xc3: return EL_UNKNOWN;                      /* EMC ("door 5") */
-    case 0xc4: return EL_UNKNOWN;                      /* EMC ("door 6") */
-    case 0xc5: return EL_UNKNOWN;                      /* EMC ("door 7") */
-    case 0xc6: return EL_UNKNOWN;                      /* EMC ("door 8") */
-    case 0xc7: return EL_UNKNOWN;                      /* EMC ("bumper") */
-
-      /* characters: see above */
-
-    case 0xec: return EL_CHAR_PERIOD;
-    case 0xed: return EL_CHAR_EXCLAM;
-    case 0xee: return EL_CHAR_COLON;
-    case 0xef: return EL_CHAR_QUESTION;
-
-    case 0xf0: return EL_CHAR_GREATER;                 /* arrow right */
-    case 0xf1: return EL_CHAR_COPYRIGHT;               /* EMC: "decor 1" */
-    case 0xf2: return EL_UNKNOWN;              /* EMC ("fake door 5") */
-    case 0xf3: return EL_UNKNOWN;              /* EMC ("fake door 6") */
-    case 0xf4: return EL_UNKNOWN;              /* EMC ("fake door 7") */
-    case 0xf5: return EL_UNKNOWN;              /* EMC ("fake door 8") */
-    case 0xf6: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0xf7: return EL_EMPTY_SPACE;                  /* EMC */
-
-    case 0xf8: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0xf9: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0xfa: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0xfb: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0xfc: return EL_EMPTY_SPACE;                  /* EMC */
-    case 0xfd: return EL_EMPTY_SPACE;                  /* EMC */
-
-    case 0xfe: return EL_PLAYER_1;                     /* EMC: "blank" */
-    case 0xff: return EL_PLAYER_2;                     /* EMC: "blank" */
-
-    default:
-      /* should never happen (all 8-bit value cases should be handled) */
-      Error(ERR_WARN, "invalid level element %d", element);
-      return EL_UNKNOWN;
-  }
-}
-
-#define EM_LEVEL_SIZE                  2106
-#define EM_LEVEL_XSIZE                 64
-#define EM_LEVEL_YSIZE                 32
-
-static void OLD_LoadLevelFromFileInfo_EM(struct LevelInfo *level,
-                                        struct LevelFileInfo *level_file_info)
-{
-  char *filename = level_file_info->filename;
-  FILE *file;
-  unsigned char leveldata[EM_LEVEL_SIZE];
-  unsigned char *header = &leveldata[EM_LEVEL_XSIZE * EM_LEVEL_YSIZE];
-  int nr = level_file_info->nr;
-  int i, x, y;
-
-  if (!(file = fopen(filename, MODE_READ)))
-  {
-    level->no_valid_file = TRUE;
-
-    Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
-
-    return;
-  }
-
-  for (i = 0; i < EM_LEVEL_SIZE; i++)
-    leveldata[i] = fgetc(file);
-
-  fclose(file);
-
-  /* check if level data is crypted by testing against known starting bytes
-     of the few existing crypted level files (from Emerald Mine 1 + 2) */
-
-  if ((leveldata[0] == 0xf1 ||
-       leveldata[0] == 0xf5) && leveldata[2] == 0xe7 && leveldata[3] == 0xee)
-  {
-    unsigned char code0 = 0x65;
-    unsigned char code1 = 0x11;
-
-    if (leveldata[0] == 0xf5)  /* error in crypted Emerald Mine 2 levels */
-      leveldata[0] = 0xf1;
-
-    /* decode crypted level data */
-
-    for (i = 0; i < EM_LEVEL_SIZE; i++)
-    {
-      leveldata[i] ^= code0;
-      leveldata[i] -= code1;
-
-      code0 = (code0 + 7) & 0xff;
-    }
-  }
-
-  level->fieldx        = EM_LEVEL_XSIZE;
-  level->fieldy        = EM_LEVEL_YSIZE;
-
-  level->time          = header[46] * 10;
-  level->gems_needed   = header[47];
-
-  /* The original Emerald Mine levels have their level number stored
-     at the second byte of the level file...
-     Do not trust this information at other level files, e.g. EMC,
-     but correct it anyway (normally the first row is completely
-     steel wall, so the correction does not hurt anyway). */
-
-  if (leveldata[1] == nr)
-    leveldata[1] = leveldata[2];       /* correct level number field */
-
-  sprintf(level->name, "Level %d", nr);                /* set level name */
-
-  level->score[SC_EMERALD]     = header[36];
-  level->score[SC_DIAMOND]     = header[37];
-  level->score[SC_ROBOT]       = header[38];
-  level->score[SC_SPACESHIP]   = header[39];
-  level->score[SC_BUG]         = header[40];
-  level->score[SC_YAMYAM]      = header[41];
-  level->score[SC_NUT]         = header[42];
-  level->score[SC_DYNAMITE]    = header[43];
-  level->score[SC_TIME_BONUS]  = header[44];
-
-  level->num_yamyam_contents = 4;
-
-  for (i = 0; i < level->num_yamyam_contents; i++)
-    for (y = 0; y < 3; y++)
-      for (x = 0; x < 3; x++)
-       level->yamyam_content[i].e[x][y] =
-         map_em_element_yam(header[i * 9 + y * 3 + x]);
-
-  level->amoeba_speed          = (header[52] * 256 + header[53]) % 256;
-  level->time_magic_wall       = (header[54] * 256 + header[55]) * 16 / 100;
-  level->time_wheel            = (header[56] * 256 + header[57]) * 16 / 100;
-  level->amoeba_content                = EL_DIAMOND;
-
-  for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
-  {
-    int new_element = map_em_element_field(leveldata[y * EM_LEVEL_XSIZE + x]);
-
-    if (new_element == EL_AMOEBA_DEAD && level->amoeba_speed)
-      new_element = EL_AMOEBA_WET;
-
-    level->field[x][y] = new_element;
-  }
-
-  x = (header[48] * 256 + header[49]) % EM_LEVEL_XSIZE;
-  y = (header[48] * 256 + header[49]) / EM_LEVEL_XSIZE;
-  level->field[x][y] = EL_PLAYER_1;
-
-  x = (header[50] * 256 + header[51]) % EM_LEVEL_XSIZE;
-  y = (header[50] * 256 + header[51]) / EM_LEVEL_XSIZE;
-  level->field[x][y] = EL_PLAYER_2;
-}
-
-#endif
-
-void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
-{
-  static int ball_xy[8][2] =
-  {
-    { 0, 0 },
-    { 1, 0 },
-    { 2, 0 },
-    { 0, 1 },
-    { 2, 1 },
-    { 0, 2 },
-    { 1, 2 },
-    { 2, 2 },
-  };
-  struct LevelInfo_EM *level_em = level->native_em_level;
-  struct LEVEL *lev = level_em->lev;
-  struct PLAYER **ply = level_em->ply;
-  int i, j, x, y;
-
-  lev->width  = MIN(level->fieldx, EM_MAX_CAVE_WIDTH);
-  lev->height = MIN(level->fieldy, EM_MAX_CAVE_HEIGHT);
-
-  lev->time_seconds     = level->time;
-  lev->required_initial = level->gems_needed;
-
-  lev->emerald_score   = level->score[SC_EMERALD];
-  lev->diamond_score   = level->score[SC_DIAMOND];
-  lev->alien_score     = level->score[SC_ROBOT];
-  lev->tank_score      = level->score[SC_SPACESHIP];
-  lev->bug_score       = level->score[SC_BUG];
-  lev->eater_score     = level->score[SC_YAMYAM];
-  lev->nut_score       = level->score[SC_NUT];
-  lev->dynamite_score  = level->score[SC_DYNAMITE];
-  lev->key_score       = level->score[SC_KEY];
-  lev->exit_score      = level->score[SC_TIME_BONUS];
-
-  for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
-    for (y = 0; y < 3; y++)
-      for (x = 0; x < 3; x++)
-       lev->eater_array[i][y * 3 + x] =
-         map_element_RND_to_EM(level->yamyam_content[i].e[x][y]);
-
-  lev->amoeba_time             = level->amoeba_speed;
-  lev->wonderwall_time_initial = level->time_magic_wall;
-  lev->wheel_time              = level->time_wheel;
-
-  lev->android_move_time       = level->android_move_time;
-  lev->android_clone_time      = level->android_clone_time;
-  lev->ball_random             = level->ball_random;
-  lev->ball_state_initial      = level->ball_state_initial;
-  lev->ball_time               = level->ball_time;
-  lev->num_ball_arrays         = level->num_ball_contents;
-
-  lev->lenses_score            = level->lenses_score;
-  lev->magnify_score           = level->magnify_score;
-  lev->slurp_score             = level->slurp_score;
-
-  lev->lenses_time             = level->lenses_time;
-  lev->magnify_time            = level->magnify_time;
-
-  lev->wind_direction_initial =
-    map_direction_RND_to_EM(level->wind_direction_initial);
-  lev->wind_cnt_initial = (level->wind_direction_initial != MV_NONE ?
-                          lev->wind_time : 0);
-
-  for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
-    for (j = 0; j < 8; j++)
-      lev->ball_array[i][j] =
-       map_element_RND_to_EM(level->
-                             ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]]);
-
-  map_android_clone_elements_RND_to_EM(level);
-
-  /* first fill the complete playfield with the default border element */
-  for (y = 0; y < EM_MAX_CAVE_HEIGHT; y++)
-    for (x = 0; x < EM_MAX_CAVE_WIDTH; x++)
-      level_em->cave[x][y] = ZBORDER;
-
-  if (BorderElement == EL_STEELWALL)
-  {
-    for (y = 0; y < lev->height + 2; y++)
-      for (x = 0; x < lev->width + 2; x++)
-       level_em->cave[x + 1][y + 1] = map_element_RND_to_EM(EL_STEELWALL);
-  }
-
-  /* then copy the real level contents from level file into the playfield */
-  for (y = 0; y < lev->height; y++) for (x = 0; x < lev->width; x++)
-  {
-    int new_element = map_element_RND_to_EM(level->field[x][y]);
-    int offset = (BorderElement == EL_STEELWALL ? 1 : 0);
-    int xx = x + 1 + offset;
-    int yy = y + 1 + offset;
-
-    if (level->field[x][y] == EL_AMOEBA_DEAD)
-      new_element = map_element_RND_to_EM(EL_AMOEBA_WET);
-
-    level_em->cave[xx][yy] = new_element;
-  }
-
-  for (i = 0; i < MAX_PLAYERS; i++)
-  {
-    ply[i]->x_initial = 0;
-    ply[i]->y_initial = 0;
-  }
-
-  /* initialize player positions and delete players from the playfield */
-  for (y = 0; y < lev->height; y++) for (x = 0; x < lev->width; x++)
-  {
-    if (ELEM_IS_PLAYER(level->field[x][y]))
-    {
-      int player_nr = GET_PLAYER_NR(level->field[x][y]);
-      int offset = (BorderElement == EL_STEELWALL ? 1 : 0);
-      int xx = x + 1 + offset;
-      int yy = y + 1 + offset;
-
-      ply[player_nr]->x_initial = xx;
-      ply[player_nr]->y_initial = yy;
-
-      level_em->cave[xx][yy] = map_element_RND_to_EM(EL_EMPTY);
-    }
-  }
-
-  if (BorderElement == EL_STEELWALL)
-  {
-    lev->width  += 2;
-    lev->height += 2;
-  }
-}
-
-void CopyNativeLevel_EM_to_RND(struct LevelInfo *level)
-{
-  static int ball_xy[8][2] =
-  {
-    { 0, 0 },
-    { 1, 0 },
-    { 2, 0 },
-    { 0, 1 },
-    { 2, 1 },
-    { 0, 2 },
-    { 1, 2 },
-    { 2, 2 },
-  };
-  struct LevelInfo_EM *level_em = level->native_em_level;
-  struct LEVEL *lev = level_em->lev;
-  struct PLAYER **ply = level_em->ply;
-  int i, j, x, y;
-
-  level->fieldx = MIN(lev->width,  MAX_LEV_FIELDX);
-  level->fieldy = MIN(lev->height, MAX_LEV_FIELDY);
-
-  level->time        = lev->time_seconds;
-  level->gems_needed = lev->required_initial;
-
-  sprintf(level->name, "Level %d", level->file_info.nr);
-
-  level->score[SC_EMERALD]     = lev->emerald_score;
-  level->score[SC_DIAMOND]     = lev->diamond_score;
-  level->score[SC_ROBOT]       = lev->alien_score;
-  level->score[SC_SPACESHIP]   = lev->tank_score;
-  level->score[SC_BUG]         = lev->bug_score;
-  level->score[SC_YAMYAM]      = lev->eater_score;
-  level->score[SC_NUT]         = lev->nut_score;
-  level->score[SC_DYNAMITE]    = lev->dynamite_score;
-  level->score[SC_KEY]         = lev->key_score;
-  level->score[SC_TIME_BONUS]  = lev->exit_score;
-
-  level->num_yamyam_contents = MAX_ELEMENT_CONTENTS;
-
-  for (i = 0; i < level->num_yamyam_contents; i++)
-    for (y = 0; y < 3; y++)
-      for (x = 0; x < 3; x++)
-       level->yamyam_content[i].e[x][y] =
-         map_element_EM_to_RND(lev->eater_array[i][y * 3 + x]);
-
-  level->amoeba_speed          = lev->amoeba_time;
-  level->time_magic_wall       = lev->wonderwall_time_initial;
-  level->time_wheel            = lev->wheel_time;
-
-  level->android_move_time     = lev->android_move_time;
-  level->android_clone_time    = lev->android_clone_time;
-  level->ball_random           = lev->ball_random;
-  level->ball_state_initial    = lev->ball_state_initial;
-  level->ball_time             = lev->ball_time;
-  level->num_ball_contents     = lev->num_ball_arrays;
-
-  level->lenses_score          = lev->lenses_score;
-  level->magnify_score         = lev->magnify_score;
-  level->slurp_score           = lev->slurp_score;
-
-  level->lenses_time           = lev->lenses_time;
-  level->magnify_time          = lev->magnify_time;
-
-  level->wind_direction_initial =
-    map_direction_EM_to_RND(lev->wind_direction_initial);
-
-  for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
-    for (j = 0; j < 8; j++)
-      level->ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]] =
-       map_element_EM_to_RND(lev->ball_array[i][j]);
-
-  map_android_clone_elements_EM_to_RND(level);
-
-  /* convert the playfield (some elements need special treatment) */
-  for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
-  {
-    int new_element = map_element_EM_to_RND(level_em->cave[x + 1][y + 1]);
-
-    if (new_element == EL_AMOEBA_WET && level->amoeba_speed == 0)
-      new_element = EL_AMOEBA_DEAD;
-
-    level->field[x][y] = new_element;
-  }
-
-  for (i = 0; i < MAX_PLAYERS; i++)
-  {
-    /* in case of all players set to the same field, use the first player */
-    int nr = MAX_PLAYERS - i - 1;
-    int jx = ply[nr]->x_initial - 1;
-    int jy = ply[nr]->y_initial - 1;
-
-    if (jx != -1 && jy != -1)
-      level->field[jx][jy] = EL_PLAYER_1 + nr;
-  }
-}
-
-
-/* ------------------------------------------------------------------------- */
-/* functions for loading SP level                                            */
-/* ------------------------------------------------------------------------- */
-
-#if 0
-
-#define NUM_SUPAPLEX_LEVELS_PER_PACKAGE        111
-#define SP_LEVEL_SIZE                  1536
-#define SP_LEVEL_XSIZE                 60
-#define SP_LEVEL_YSIZE                 24
-#define SP_LEVEL_NAME_LEN              23
-
-static void LoadLevelFromFileStream_SP(FILE *file, struct LevelInfo *level,
-                                      int nr)
-{
-  int initial_player_gravity;
-  int num_special_ports;
-  int i, x, y;
-
-  /* for details of the Supaplex level format, see Herman Perk's Supaplex
-     documentation file "SPFIX63.DOC" from his Supaplex "SpeedFix" package */
-
-  /* read level body (width * height == 60 * 24 tiles == 1440 bytes) */
-  for (y = 0; y < SP_LEVEL_YSIZE; y++)
-  {
-    for (x = 0; x < SP_LEVEL_XSIZE; x++)
-    {
-      int element_old = fgetc(file);
-      int element_new;
-
-      if (element_old <= 0x27)
-       element_new = getMappedElement(EL_SP_START + element_old);
-      else if (element_old == 0x28)
-       element_new = EL_INVISIBLE_WALL;
-      else
-      {
-       Error(ERR_WARN, "in level %d, at position %d, %d:", nr, x, y);
-       Error(ERR_WARN, "invalid level element %d", element_old);
-
-       element_new = EL_UNKNOWN;
-      }
-
-      level->field[x][y] = element_new;
-    }
-  }
-
-  ReadUnusedBytesFromFile(file, 4);    /* (not used by Supaplex engine) */
-
-  /* initial gravity: 1 == "on", anything else (0) == "off" */
-  initial_player_gravity = (fgetc(file) == 1 ? TRUE : FALSE);
-
-  for (i = 0; i < MAX_PLAYERS; i++)
-    level->initial_player_gravity[i] = initial_player_gravity;
-
-  ReadUnusedBytesFromFile(file, 1);    /* (not used by Supaplex engine) */
-
-  /* level title in uppercase letters, padded with dashes ("-") (23 bytes) */
-  for (i = 0; i < SP_LEVEL_NAME_LEN; i++)
-    level->name[i] = fgetc(file);
-  level->name[SP_LEVEL_NAME_LEN] = '\0';
-
-  /* initial "freeze zonks": 2 == "on", anything else (0, 1) == "off" */
-  ReadUnusedBytesFromFile(file, 1);    /* (not used by R'n'D engine) */
-
-  /* number of infotrons needed; 0 means that Supaplex will count the total
-     amount of infotrons in the level and use the low byte of that number
-     (a multiple of 256 infotrons will result in "0 infotrons needed"!) */
-  level->gems_needed = fgetc(file);
-
-  /* number of special ("gravity") port entries below (maximum 10 allowed) */
-  num_special_ports = fgetc(file);
-
-  /* database of properties of up to 10 special ports (6 bytes per port) */
-  for (i = 0; i < 10; i++)
-  {
-    int port_location, port_x, port_y, port_element;
-    int gravity;
-
-    /* high and low byte of the location of a special port; if (x, y) are the
-       coordinates of a port in the field and (0, 0) is the top-left corner,
-       the 16 bit value here calculates as 2 * (x + (y * 60)) (this is twice
-       of what may be expected: Supaplex works with a game field in memory
-       which is 2 bytes per tile) */
-    port_location = getFile16BitBE(file);
-
-    /* change gravity: 1 == "turn on", anything else (0) == "turn off" */
-    gravity = fgetc(file);
-
-    /* "freeze zonks": 2 == "turn on", anything else (0, 1) == "turn off" */
-    ReadUnusedBytesFromFile(file, 1);  /* (not used by R'n'D engine) */
-
-    /* "freeze enemies": 1 == "turn on", anything else (0) == "turn off" */
-    ReadUnusedBytesFromFile(file, 1);  /* (not used by R'n'D engine) */
-
-    ReadUnusedBytesFromFile(file, 1);  /* (not used by Supaplex engine) */
-
-    if (i >= num_special_ports)
-      continue;
-
-    port_x = (port_location / 2) % SP_LEVEL_XSIZE;
-    port_y = (port_location / 2) / SP_LEVEL_XSIZE;
-
-    if (port_x < 0 || port_x >= SP_LEVEL_XSIZE ||
-       port_y < 0 || port_y >= SP_LEVEL_YSIZE)
-    {
-      Error(ERR_WARN, "special port position (%d, %d) out of bounds",
-           port_x, port_y);
-
-      continue;
-    }
-
-    port_element = level->field[port_x][port_y];
-
-    if (port_element < EL_SP_GRAVITY_PORT_RIGHT ||
-       port_element > EL_SP_GRAVITY_PORT_UP)
-    {
-      Error(ERR_WARN, "no special port at position (%d, %d)", port_x, port_y);
-
-      continue;
-    }
-
-    /* change previous (wrong) gravity inverting special port to either
-       gravity enabling special port or gravity disabling special port */
-    level->field[port_x][port_y] +=
-      (gravity == 1 ? EL_SP_GRAVITY_ON_PORT_RIGHT :
-       EL_SP_GRAVITY_OFF_PORT_RIGHT) - EL_SP_GRAVITY_PORT_RIGHT;
-  }
-
-  ReadUnusedBytesFromFile(file, 4);    /* (not used by Supaplex engine) */
-
-  /* change special gravity ports without database entries to normal ports */
-  for (y = 0; y < SP_LEVEL_YSIZE; y++)
-    for (x = 0; x < SP_LEVEL_XSIZE; x++)
-      if (level->field[x][y] >= EL_SP_GRAVITY_PORT_RIGHT &&
-         level->field[x][y] <= EL_SP_GRAVITY_PORT_UP)
-       level->field[x][y] += EL_SP_PORT_RIGHT - EL_SP_GRAVITY_PORT_RIGHT;
-
-  /* auto-determine number of infotrons if it was stored as "0" -- see above */
-  if (level->gems_needed == 0)
-  {
-    for (y = 0; y < SP_LEVEL_YSIZE; y++)
-      for (x = 0; x < SP_LEVEL_XSIZE; x++)
-       if (level->field[x][y] == EL_SP_INFOTRON)
-         level->gems_needed++;
-
-    level->gems_needed &= 0xff;                /* only use low byte -- see above */
-  }
-
-  level->fieldx = SP_LEVEL_XSIZE;
-  level->fieldy = SP_LEVEL_YSIZE;
-
-  level->time = 0;                     /* no time limit */
-  level->amoeba_speed = 0;
-  level->time_magic_wall = 0;
-  level->time_wheel = 0;
-  level->amoeba_content = EL_EMPTY;
-
-#if 1
-  /* original Supaplex does not use score values -- use default values */
-#else
-  for (i = 0; i < LEVEL_SCORE_ELEMENTS; i++)
-    level->score[i] = 0;
-#endif
-
-  /* there are no yamyams in supaplex levels */
-  for (i = 0; i < level->num_yamyam_contents; i++)
-    for (y = 0; y < 3; y++)
-      for (x = 0; x < 3; x++)
-       level->yamyam_content[i].e[x][y] = EL_EMPTY;
-}
-
-static void LoadLevelFromFileInfo_SP(struct LevelInfo *level,
-                                    struct LevelFileInfo *level_file_info,
-                                    boolean level_info_only)
-{
-  char *filename = level_file_info->filename;
-  FILE *file;
-  int nr = level_file_info->nr - leveldir_current->first_level;
-  int i, l, x, y;
-  char name_first, name_last;
-  struct LevelInfo multipart_level;
-  int multipart_xpos, multipart_ypos;
-  boolean is_multipart_level;
-  boolean is_first_part;
-  boolean reading_multipart_level = FALSE;
-  boolean use_empty_level = FALSE;
-
-  if (!(file = fopen(filename, MODE_READ)))
-  {
-    level->no_valid_file = TRUE;
-
-    if (!level_info_only)
-      Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
-
-    return;
-  }
-
-  /* position file stream to the requested level inside the level package */
-  if (level_file_info->packed &&
-      fseek(file, nr * SP_LEVEL_SIZE, SEEK_SET) != 0)
-  {
-    level->no_valid_file = TRUE;
-
-    Error(ERR_WARN, "cannot fseek in file '%s' -- using empty level", filename);
-
-    return;
-  }
-
-  /* there exist Supaplex level package files with multi-part levels which
-     can be detected as follows: instead of leading and trailing dashes ('-')
-     to pad the level name, they have leading and trailing numbers which are
-     the x and y coordinations of the current part of the multi-part level;
-     if there are '?' characters instead of numbers on the left or right side
-     of the level name, the multi-part level consists of only horizontal or
-     vertical parts */
-
-  for (l = nr; l < NUM_SUPAPLEX_LEVELS_PER_PACKAGE; l++)
-  {
-    LoadLevelFromFileStream_SP(file, level, l);
-
-    /* check if this level is a part of a bigger multi-part level */
-
-    name_first = level->name[0];
-    name_last  = level->name[SP_LEVEL_NAME_LEN - 1];
-
-    is_multipart_level =
-      ((name_first == '?' || (name_first >= '0' && name_first <= '9')) &&
-       (name_last  == '?' || (name_last  >= '0' && name_last  <= '9')));
-
-    is_first_part =
-      ((name_first == '?' || name_first == '1') &&
-       (name_last  == '?' || name_last  == '1'));
-
-    /* correct leading multipart level meta information in level name */
-    for (i = 0; i < SP_LEVEL_NAME_LEN && level->name[i] == name_first; i++)
-      level->name[i] = '-';
-
-    /* correct trailing multipart level meta information in level name */
-    for (i = SP_LEVEL_NAME_LEN - 1; i >= 0 && level->name[i] == name_last; i--)
-      level->name[i] = '-';
-
-    /* ---------- check for normal single level ---------- */
-
-    if (!reading_multipart_level && !is_multipart_level)
-    {
-      /* the current level is simply a normal single-part level, and we are
-        not reading a multi-part level yet, so return the level as it is */
-
-      break;
-    }
-
-    /* ---------- check for empty level (unused multi-part) ---------- */
-
-    if (!reading_multipart_level && is_multipart_level && !is_first_part)
-    {
-      /* this is a part of a multi-part level, but not the first part
-        (and we are not already reading parts of a multi-part level);
-        in this case, use an empty level instead of the single part */
-
-      use_empty_level = TRUE;
-
-      break;
-    }
-
-    /* ---------- check for finished multi-part level ---------- */
-
-    if (reading_multipart_level &&
-       (!is_multipart_level ||
-        !strEqual(level->name, multipart_level.name)))
-    {
-      /* we are already reading parts of a multi-part level, but this level is
-        either not a multi-part level, or a part of a different multi-part
-        level; in both cases, the multi-part level seems to be complete */
-
-      break;
-    }
-
-    /* ---------- here we have one part of a multi-part level ---------- */
-
-    reading_multipart_level = TRUE;
-
-    if (is_first_part) /* start with first part of new multi-part level */
-    {
-      /* copy level info structure from first part */
-      multipart_level = *level;
-
-      /* clear playfield of new multi-part level */
-      for (y = 0; y < MAX_LEV_FIELDY; y++)
-       for (x = 0; x < MAX_LEV_FIELDX; x++)
-         multipart_level.field[x][y] = EL_EMPTY;
-    }
-
-    if (name_first == '?')
-      name_first = '1';
-    if (name_last == '?')
-      name_last = '1';
-
-    multipart_xpos = (int)(name_first - '0');
-    multipart_ypos = (int)(name_last  - '0');
-
-#if 0
-    printf("----------> part (%d/%d) of multi-part level '%s'\n",
-          multipart_xpos, multipart_ypos, multipart_level.name);
-#endif
-
-    if (multipart_xpos * SP_LEVEL_XSIZE > MAX_LEV_FIELDX ||
-       multipart_ypos * SP_LEVEL_YSIZE > MAX_LEV_FIELDY)
-    {
-      Error(ERR_WARN, "multi-part level is too big -- ignoring part of it");
-
-      break;
-    }
-
-    multipart_level.fieldx = MAX(multipart_level.fieldx,
-                                multipart_xpos * SP_LEVEL_XSIZE);
-    multipart_level.fieldy = MAX(multipart_level.fieldy,
-                                multipart_ypos * SP_LEVEL_YSIZE);
-
-    /* copy level part at the right position of multi-part level */
-    for (y = 0; y < SP_LEVEL_YSIZE; y++)
-    {
-      for (x = 0; x < SP_LEVEL_XSIZE; x++)
-      {
-       int start_x = (multipart_xpos - 1) * SP_LEVEL_XSIZE;
-       int start_y = (multipart_ypos - 1) * SP_LEVEL_YSIZE;
-
-       multipart_level.field[start_x + x][start_y + y] = level->field[x][y];
-      }
-    }
-  }
-
-  fclose(file);
-
-  if (use_empty_level)
-  {
-    setLevelInfoToDefaults(level);
-
-    level->fieldx = SP_LEVEL_XSIZE;
-    level->fieldy = SP_LEVEL_YSIZE;
-
-    for (y = 0; y < SP_LEVEL_YSIZE; y++)
-      for (x = 0; x < SP_LEVEL_XSIZE; x++)
-       level->field[x][y] = EL_EMPTY;
-
-    strcpy(level->name, "-------- EMPTY --------");
-
-    Error(ERR_WARN, "single part of multi-part level -- using empty level");
-  }
-
-  if (reading_multipart_level)
-    *level = multipart_level;
-}
-
-#endif
-
-void CopyNativeLevel_RND_to_SP(struct LevelInfo *level)
-{
-  struct LevelInfo_SP *level_sp = level->native_sp_level;
-  LevelInfoType *header = &level_sp->header;
-  int i, x, y;
-
-  level_sp->width  = level->fieldx;
-  level_sp->height = level->fieldy;
-
-  for (x = 0; x < level->fieldx; x++)
-    for (y = 0; y < level->fieldy; y++)
-      level_sp->playfield[x][y] = map_element_RND_to_SP(level->field[x][y]);
-
-  header->InitialGravity = (level->initial_player_gravity[0] ? 1 : 0);
-
-  for (i = 0; i < SP_LEVEL_NAME_LEN; i++)
-    header->LevelTitle[i] = level->name[i];
-  /* !!! NO STRING TERMINATION IN SUPAPLEX VB CODE YET -- FIX THIS !!! */
-
-  header->InfotronsNeeded = level->gems_needed;
-
-  header->SpecialPortCount = 0;
-
-  for (x = 0; x < level->fieldx; x++) for (y = 0; y < level->fieldy; y++)
+    /* level files from versions before 1.2.0 without chunk structure */
+    LoadLevel_HEAD(file, LEVEL_CHUNK_HEAD_SIZE,         level);
+    LoadLevel_BODY(file, level->fieldx * level->fieldy, level);
+  }
+  else
   {
-    boolean gravity_port_found = FALSE;
-    boolean gravity_port_valid = FALSE;
-    int gravity_port_flag;
-    int gravity_port_base_element;
-    int element = level->field[x][y];
-
-    if (element >= EL_SP_GRAVITY_ON_PORT_RIGHT &&
-       element <= EL_SP_GRAVITY_ON_PORT_UP)
-    {
-      gravity_port_found = TRUE;
-      gravity_port_valid = TRUE;
-      gravity_port_flag = 1;
-      gravity_port_base_element = EL_SP_GRAVITY_ON_PORT_RIGHT;
-    }
-    else if (element >= EL_SP_GRAVITY_OFF_PORT_RIGHT &&
-            element <= EL_SP_GRAVITY_OFF_PORT_UP)
+    static struct
     {
-      gravity_port_found = TRUE;
-      gravity_port_valid = TRUE;
-      gravity_port_flag = 0;
-      gravity_port_base_element = EL_SP_GRAVITY_OFF_PORT_RIGHT;
+      char *name;
+      int size;
+      int (*loader)(File *, int, struct LevelInfo *);
     }
-    else if (element >= EL_SP_GRAVITY_PORT_RIGHT &&
-            element <= EL_SP_GRAVITY_PORT_UP)
+    chunk_info[] =
     {
-      /* change R'n'D style gravity inverting special port to normal port
-        (there are no gravity inverting ports in native Supaplex engine) */
+      { "VERS", LEVEL_CHUNK_VERS_SIZE, LoadLevel_VERS },
+      { "DATE", LEVEL_CHUNK_DATE_SIZE, LoadLevel_DATE },
+      { "HEAD", LEVEL_CHUNK_HEAD_SIZE, LoadLevel_HEAD },
+      { "NAME", LEVEL_CHUNK_NAME_SIZE, LoadLevel_NAME },
+      { "AUTH", LEVEL_CHUNK_AUTH_SIZE, LoadLevel_AUTH },
+      { "INFO", -1,                    LoadLevel_INFO },
+      { "BODY", -1,                    LoadLevel_BODY },
+      { "CONT", -1,                    LoadLevel_CONT },
+      { "CNT2", LEVEL_CHUNK_CNT2_SIZE, LoadLevel_CNT2 },
+      { "CNT3", -1,                    LoadLevel_CNT3 },
+      { "CUS1", -1,                    LoadLevel_CUS1 },
+      { "CUS2", -1,                    LoadLevel_CUS2 },
+      { "CUS3", -1,                    LoadLevel_CUS3 },
+      { "CUS4", -1,                    LoadLevel_CUS4 },
+      { "GRP1", -1,                    LoadLevel_GRP1 },
+      { "CONF", -1,                    LoadLevel_CONF },
+      { "ELEM", -1,                    LoadLevel_ELEM },
+      { "NOTE", -1,                    LoadLevel_NOTE },
+      { "CUSX", -1,                    LoadLevel_CUSX },
+      { "GRPX", -1,                    LoadLevel_GRPX },
 
-      gravity_port_found = TRUE;
-      gravity_port_valid = FALSE;
-      gravity_port_base_element = EL_SP_GRAVITY_PORT_RIGHT;
-    }
+      {  NULL,  0,                     NULL }
+    };
 
-    if (gravity_port_found)
+    while (getFileChunkBE(file, chunk_name, &chunk_size))
     {
-      if (gravity_port_valid &&
-         header->SpecialPortCount < SP_MAX_SPECIAL_PORTS)
-      {
-       SpecialPortType *port = &header->SpecialPort[header->SpecialPortCount];
-
-       port->PortLocation = (y * level->fieldx + x) * 2;
-       port->Gravity = gravity_port_flag;
+      int i = 0;
 
-       element += EL_SP_GRAVITY_PORT_RIGHT - gravity_port_base_element;
+      while (chunk_info[i].name != NULL &&
+            !strEqual(chunk_name, chunk_info[i].name))
+       i++;
 
-       header->SpecialPortCount++;
+      if (chunk_info[i].name == NULL)
+      {
+       Error(ERR_WARN, "unknown chunk '%s' in level file '%s'",
+             chunk_name, filename);
+       ReadUnusedBytesFromFile(file, chunk_size);
+      }
+      else if (chunk_info[i].size != -1 &&
+              chunk_info[i].size != chunk_size)
+      {
+       Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'",
+             chunk_size, chunk_name, filename);
+       ReadUnusedBytesFromFile(file, chunk_size);
       }
       else
       {
-       /* change special gravity port to normal port */
+       /* call function to load this level chunk */
+       int chunk_size_expected =
+         (chunk_info[i].loader)(file, chunk_size, level);
 
-       element += EL_SP_PORT_RIGHT - gravity_port_base_element;
+       /* the size of some chunks cannot be checked before reading other
+          chunks first (like "HEAD" and "BODY") that contain some header
+          information, so check them here */
+       if (chunk_size_expected != chunk_size)
+       {
+         Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'",
+               chunk_size, chunk_name, filename);
+       }
       }
-
-      level_sp->playfield[x][y] = element - EL_SP_START;
-    }
-  }
-}
-
-void CopyNativeLevel_SP_to_RND(struct LevelInfo *level)
-{
-  struct LevelInfo_SP *level_sp = level->native_sp_level;
-  LevelInfoType *header = &level_sp->header;
-  int i, x, y;
-
-  level->fieldx = level_sp->width;
-  level->fieldy = level_sp->height;
-
-  for (x = 0; x < level->fieldx; x++)
-  {
-    for (y = 0; y < level->fieldy; y++)
-    {
-      int element_old = level_sp->playfield[x][y];
-      int element_new = getMappedElement(map_element_SP_to_RND(element_old));
-
-      if (element_new == EL_UNKNOWN)
-       Error(ERR_WARN, "invalid element %d at position %d, %d",
-             element_old, x, y);
-
-      level->field[x][y] = element_new;
-    }
-  }
-
-  for (i = 0; i < MAX_PLAYERS; i++)
-    level->initial_player_gravity[i] =
-      (header->InitialGravity == 1 ? TRUE : FALSE);
-
-  for (i = 0; i < SP_LEVEL_NAME_LEN; i++)
-    level->name[i] = header->LevelTitle[i];
-  level->name[SP_LEVEL_NAME_LEN] = '\0';
-
-  level->gems_needed = header->InfotronsNeeded;
-
-  for (i = 0; i < header->SpecialPortCount; i++)
-  {
-    SpecialPortType *port = &header->SpecialPort[i];
-    int port_location = port->PortLocation;
-    int gravity = port->Gravity;
-    int port_x, port_y, port_element;
-
-    port_x = (port_location / 2) % level->fieldx;
-    port_y = (port_location / 2) / level->fieldx;
-
-    if (port_x < 0 || port_x >= level->fieldx ||
-       port_y < 0 || port_y >= level->fieldy)
-    {
-      Error(ERR_WARN, "special port position (%d, %d) out of bounds",
-           port_x, port_y);
-
-      continue;
-    }
-
-    port_element = level->field[port_x][port_y];
-
-    if (port_element < EL_SP_GRAVITY_PORT_RIGHT ||
-       port_element > EL_SP_GRAVITY_PORT_UP)
-    {
-      Error(ERR_WARN, "no special port at position (%d, %d)", port_x, port_y);
-
-      continue;
     }
-
-    /* change previous (wrong) gravity inverting special port to either
-       gravity enabling special port or gravity disabling special port */
-    level->field[port_x][port_y] +=
-      (gravity == 1 ? EL_SP_GRAVITY_ON_PORT_RIGHT :
-       EL_SP_GRAVITY_OFF_PORT_RIGHT) - EL_SP_GRAVITY_PORT_RIGHT;
   }
 
-  /* change special gravity ports without database entries to normal ports */
-  for (x = 0; x < level->fieldx; x++)
-    for (y = 0; y < level->fieldy; y++)
-      if (level->field[x][y] >= EL_SP_GRAVITY_PORT_RIGHT &&
-         level->field[x][y] <= EL_SP_GRAVITY_PORT_UP)
-       level->field[x][y] += EL_SP_PORT_RIGHT - EL_SP_GRAVITY_PORT_RIGHT;
-
-  level->time = 0;                     /* no time limit */
-  level->amoeba_speed = 0;
-  level->time_magic_wall = 0;
-  level->time_wheel = 0;
-  level->amoeba_content = EL_EMPTY;
-
-#if 1
-  /* original Supaplex does not use score values -- use default values */
-#else
-  for (i = 0; i < LEVEL_SCORE_ELEMENTS; i++)
-    level->score[i] = 0;
-#endif
-
-  /* there are no yamyams in supaplex levels */
-  for (i = 0; i < level->num_yamyam_contents; i++)
-    for (x = 0; x < 3; x++)
-      for (y = 0; y < 3; y++)
-       level->yamyam_content[i].e[x][y] = EL_EMPTY;
+  closeFile(file);
 }
 
-static void CopyNativeTape_RND_to_SP(struct LevelInfo *level)
-{
-  struct LevelInfo_SP *level_sp = level->native_sp_level;
-  struct DemoInfo_SP *demo = &level_sp->demo;
-  int i, j;
-
-  /* always start with reliable default values */
-  demo->is_available = FALSE;
-  demo->length = 0;
 
-  if (TAPE_IS_EMPTY(tape))
-    return;
+/* ------------------------------------------------------------------------- */
+/* functions for loading EM level                                            */
+/* ------------------------------------------------------------------------- */
 
-  demo->level_nr = tape.level_nr;      /* (currently not used) */
+void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
+{
+  static int ball_xy[8][2] =
+  {
+    { 0, 0 },
+    { 1, 0 },
+    { 2, 0 },
+    { 0, 1 },
+    { 2, 1 },
+    { 0, 2 },
+    { 1, 2 },
+    { 2, 2 },
+  };
+  struct LevelInfo_EM *level_em = level->native_em_level;
+  struct LEVEL *lev = level_em->lev;
+  struct PLAYER **ply = level_em->ply;
+  int i, j, x, y;
 
-  level_sp->header.DemoRandomSeed = tape.random_seed;
+  lev->width  = MIN(level->fieldx, EM_MAX_CAVE_WIDTH);
+  lev->height = MIN(level->fieldy, EM_MAX_CAVE_HEIGHT);
 
-  demo->length = 0;
-  for (i = 0; i < tape.length; i++)
-  {
-    int demo_action = map_key_RND_to_SP(tape.pos[i].action[0]);
-    int demo_repeat = tape.pos[i].delay;
+  lev->time_seconds     = level->time;
+  lev->required_initial = level->gems_needed;
 
-    for (j = 0; j < demo_repeat / 16; j++)
-      demo->data[demo->length++] = 0xf0 | demo_action;
+  lev->emerald_score   = level->score[SC_EMERALD];
+  lev->diamond_score   = level->score[SC_DIAMOND];
+  lev->alien_score     = level->score[SC_ROBOT];
+  lev->tank_score      = level->score[SC_SPACESHIP];
+  lev->bug_score       = level->score[SC_BUG];
+  lev->eater_score     = level->score[SC_YAMYAM];
+  lev->nut_score       = level->score[SC_NUT];
+  lev->dynamite_score  = level->score[SC_DYNAMITE];
+  lev->key_score       = level->score[SC_KEY];
+  lev->exit_score      = level->score[SC_TIME_BONUS];
 
-    if (demo_repeat % 16)
-      demo->data[demo->length++] = ((demo_repeat % 16 - 1) << 4) | demo_action;
-  }
+  for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
+    for (y = 0; y < 3; y++)
+      for (x = 0; x < 3; x++)
+       lev->eater_array[i][y * 3 + x] =
+         map_element_RND_to_EM(level->yamyam_content[i].e[x][y]);
 
-  demo->data[demo->length++] = 0xff;
+  lev->amoeba_time             = level->amoeba_speed;
+  lev->wonderwall_time_initial = level->time_magic_wall;
+  lev->wheel_time              = level->time_wheel;
 
-  demo->is_available = TRUE;
-}
+  lev->android_move_time       = level->android_move_time;
+  lev->android_clone_time      = level->android_clone_time;
+  lev->ball_random             = level->ball_random;
+  lev->ball_state_initial      = level->ball_state_initial;
+  lev->ball_time               = level->ball_time;
+  lev->num_ball_arrays         = level->num_ball_contents;
 
-static void setTapeInfoToDefaults();
+  lev->lenses_score            = level->lenses_score;
+  lev->magnify_score           = level->magnify_score;
+  lev->slurp_score             = level->slurp_score;
 
-static void CopyNativeTape_SP_to_RND(struct LevelInfo *level)
-{
-  struct LevelInfo_SP *level_sp = level->native_sp_level;
-  struct DemoInfo_SP *demo = &level_sp->demo;
-  char *filename = level->file_info.filename;
-  int i;
+  lev->lenses_time             = level->lenses_time;
+  lev->magnify_time            = level->magnify_time;
 
-  /* always start with reliable default values */
-  setTapeInfoToDefaults();
+  lev->wind_direction_initial =
+    map_direction_RND_to_EM(level->wind_direction_initial);
+  lev->wind_cnt_initial = (level->wind_direction_initial != MV_NONE ?
+                          lev->wind_time : 0);
 
-  if (!demo->is_available)
-    return;
+  for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
+    for (j = 0; j < 8; j++)
+      lev->ball_array[i][j] =
+       map_element_RND_to_EM(level->
+                             ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]]);
 
-  tape.level_nr = demo->level_nr;      /* (currently not used) */
-  tape.length = demo->length - 1;      /* without "end of demo" byte */
-  tape.random_seed = level_sp->header.DemoRandomSeed;
+  map_android_clone_elements_RND_to_EM(level);
 
-  TapeSetDateFromEpochSeconds(getFileTimestampEpochSeconds(filename));
+  /* first fill the complete playfield with the default border element */
+  for (y = 0; y < EM_MAX_CAVE_HEIGHT; y++)
+    for (x = 0; x < EM_MAX_CAVE_WIDTH; x++)
+      level_em->cave[x][y] = ZBORDER;
 
-  for (i = 0; i < demo->length - 1; i++)
+  if (BorderElement == EL_STEELWALL)
   {
-    int demo_action = demo->data[i] & 0x0f;
-    int demo_repeat = (demo->data[i] & 0xf0) >> 4;
-
-    tape.pos[i].action[0] = map_key_SP_to_RND(demo_action);
-    tape.pos[i].delay = demo_repeat + 1;
+    for (y = 0; y < lev->height + 2; y++)
+      for (x = 0; x < lev->width + 2; x++)
+       level_em->cave[x + 1][y + 1] = map_element_RND_to_EM(EL_STEELWALL);
   }
 
-  tape.length_seconds = GetTapeLength();
-}
-
-
-/* ------------------------------------------------------------------------- */
-/* functions for loading DC level                                            */
-/* ------------------------------------------------------------------------- */
+  /* then copy the real level contents from level file into the playfield */
+  for (y = 0; y < lev->height; y++) for (x = 0; x < lev->width; x++)
+  {
+    int new_element = map_element_RND_to_EM(level->field[x][y]);
+    int offset = (BorderElement == EL_STEELWALL ? 1 : 0);
+    int xx = x + 1 + offset;
+    int yy = y + 1 + offset;
 
-#define DC_LEVEL_HEADER_SIZE           344
+    if (level->field[x][y] == EL_AMOEBA_DEAD)
+      new_element = map_element_RND_to_EM(EL_AMOEBA_WET);
 
-unsigned short getDecodedWord_DC(unsigned short data_encoded, boolean init)
-{
-  static int last_data_encoded;
-  static int offset1;
-  static int offset2;
-  int diff;
-  int diff_hi, diff_lo;
-  int data_hi, data_lo;
-  unsigned short data_decoded;
+    level_em->cave[xx][yy] = new_element;
+  }
 
-  if (init)
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
-    last_data_encoded = 0;
-    offset1 = -1;
-    offset2 = 0;
-
-    return 0;
+    ply[i]->x_initial = 0;
+    ply[i]->y_initial = 0;
   }
 
-  diff = data_encoded - last_data_encoded;
-  diff_hi = diff & ~0xff;
-  diff_lo = diff &  0xff;
-
-  offset2 += diff_lo;
-
-  data_hi = diff_hi - (offset1 << 8) + (offset2 & 0xff00);
-  data_lo = (diff_lo + (data_hi >> 16)) & 0x00ff;
-  data_hi = data_hi & 0xff00;
-
-  data_decoded = data_hi | data_lo;
+  /* initialize player positions and delete players from the playfield */
+  for (y = 0; y < lev->height; y++) for (x = 0; x < lev->width; x++)
+  {
+    if (ELEM_IS_PLAYER(level->field[x][y]))
+    {
+      int player_nr = GET_PLAYER_NR(level->field[x][y]);
+      int offset = (BorderElement == EL_STEELWALL ? 1 : 0);
+      int xx = x + 1 + offset;
+      int yy = y + 1 + offset;
 
-  last_data_encoded = data_encoded;
+      ply[player_nr]->x_initial = xx;
+      ply[player_nr]->y_initial = yy;
 
-  offset1 = (offset1 + 1) % 31;
-  offset2 = offset2 & 0xff;
+      level_em->cave[xx][yy] = map_element_RND_to_EM(EL_EMPTY);
+    }
+  }
 
-  return data_decoded;
+  if (BorderElement == EL_STEELWALL)
+  {
+    lev->width  += 2;
+    lev->height += 2;
+  }
 }
 
-int getMappedElement_DC(int element)
+void CopyNativeLevel_EM_to_RND(struct LevelInfo *level)
 {
-  switch (element)
+  static int ball_xy[8][2] =
   {
-    case 0x0000:
-      element = EL_ROCK;
-      break;
-
-      /* 0x0117 - 0x036e: (?) */
-      /* EL_DIAMOND */
-
-      /* 0x042d - 0x0684: (?) */
-      /* EL_EMERALD */
+    { 0, 0 },
+    { 1, 0 },
+    { 2, 0 },
+    { 0, 1 },
+    { 2, 1 },
+    { 0, 2 },
+    { 1, 2 },
+    { 2, 2 },
+  };
+  struct LevelInfo_EM *level_em = level->native_em_level;
+  struct LEVEL *lev = level_em->lev;
+  struct PLAYER **ply = level_em->ply;
+  int i, j, x, y;
 
-    case 0x06f1:
-      element = EL_NUT;
-      break;
+  level->fieldx = MIN(lev->width,  MAX_LEV_FIELDX);
+  level->fieldy = MIN(lev->height, MAX_LEV_FIELDY);
 
-    case 0x074c:
-      element = EL_BOMB;
-      break;
+  level->time        = lev->time_seconds;
+  level->gems_needed = lev->required_initial;
 
-    case 0x07a4:
-      element = EL_PEARL;
-      break;
+  sprintf(level->name, "Level %d", level->file_info.nr);
 
-    case 0x0823:
-      element = EL_CRYSTAL;
-      break;
+  level->score[SC_EMERALD]     = lev->emerald_score;
+  level->score[SC_DIAMOND]     = lev->diamond_score;
+  level->score[SC_ROBOT]       = lev->alien_score;
+  level->score[SC_SPACESHIP]   = lev->tank_score;
+  level->score[SC_BUG]         = lev->bug_score;
+  level->score[SC_YAMYAM]      = lev->eater_score;
+  level->score[SC_NUT]         = lev->nut_score;
+  level->score[SC_DYNAMITE]    = lev->dynamite_score;
+  level->score[SC_KEY]         = lev->key_score;
+  level->score[SC_TIME_BONUS]  = lev->exit_score;
 
-    case 0x0e77:       /* quicksand (boulder) */
-      element = EL_QUICKSAND_FAST_FULL;
-      break;
+  level->num_yamyam_contents = MAX_ELEMENT_CONTENTS;
 
-    case 0x0e99:       /* slow quicksand (boulder) */
-      element = EL_QUICKSAND_FULL;
-      break;
+  for (i = 0; i < level->num_yamyam_contents; i++)
+    for (y = 0; y < 3; y++)
+      for (x = 0; x < 3; x++)
+       level->yamyam_content[i].e[x][y] =
+         map_element_EM_to_RND(lev->eater_array[i][y * 3 + x]);
 
-    case 0x0ed2:
-      element = EL_EM_EXIT_OPEN;
-      break;
+  level->amoeba_speed          = lev->amoeba_time;
+  level->time_magic_wall       = lev->wonderwall_time_initial;
+  level->time_wheel            = lev->wheel_time;
 
-    case 0x0ee3:
-      element = EL_EM_EXIT_CLOSED;
-      break;
+  level->android_move_time     = lev->android_move_time;
+  level->android_clone_time    = lev->android_clone_time;
+  level->ball_random           = lev->ball_random;
+  level->ball_state_initial    = lev->ball_state_initial;
+  level->ball_time             = lev->ball_time;
+  level->num_ball_contents     = lev->num_ball_arrays;
 
-    case 0x0eeb:
-      element = EL_EM_STEEL_EXIT_OPEN;
-      break;
+  level->lenses_score          = lev->lenses_score;
+  level->magnify_score         = lev->magnify_score;
+  level->slurp_score           = lev->slurp_score;
 
-    case 0x0efc:
-      element = EL_EM_STEEL_EXIT_CLOSED;
-      break;
+  level->lenses_time           = lev->lenses_time;
+  level->magnify_time          = lev->magnify_time;
 
-    case 0x0f4f:       /* dynamite (lit 1) */
-      element = EL_EM_DYNAMITE_ACTIVE;
-      break;
+  level->wind_direction_initial =
+    map_direction_EM_to_RND(lev->wind_direction_initial);
 
-    case 0x0f57:       /* dynamite (lit 2) */
-      element = EL_EM_DYNAMITE_ACTIVE;
-      break;
+  for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
+    for (j = 0; j < 8; j++)
+      level->ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]] =
+       map_element_EM_to_RND(lev->ball_array[i][j]);
 
-    case 0x0f5f:       /* dynamite (lit 3) */
-      element = EL_EM_DYNAMITE_ACTIVE;
-      break;
+  map_android_clone_elements_EM_to_RND(level);
 
-    case 0x0f67:       /* dynamite (lit 4) */
-      element = EL_EM_DYNAMITE_ACTIVE;
-      break;
+  /* convert the playfield (some elements need special treatment) */
+  for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
+  {
+    int new_element = map_element_EM_to_RND(level_em->cave[x + 1][y + 1]);
 
-    case 0x0f81:
-    case 0x0f82:
-    case 0x0f83:
-    case 0x0f84:
-      element = EL_AMOEBA_WET;
-      break;
+    if (new_element == EL_AMOEBA_WET && level->amoeba_speed == 0)
+      new_element = EL_AMOEBA_DEAD;
 
-    case 0x0f85:
-      element = EL_AMOEBA_DROP;
-      break;
+    level->field[x][y] = new_element;
+  }
 
-    case 0x0fb9:
-      element = EL_DC_MAGIC_WALL;
-      break;
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    /* in case of all players set to the same field, use the first player */
+    int nr = MAX_PLAYERS - i - 1;
+    int jx = ply[nr]->x_initial - 1;
+    int jy = ply[nr]->y_initial - 1;
 
-    case 0x0fd0:
-      element = EL_SPACESHIP_UP;
-      break;
+    if (jx != -1 && jy != -1)
+      level->field[jx][jy] = EL_PLAYER_1 + nr;
+  }
+}
 
-    case 0x0fd9:
-      element = EL_SPACESHIP_DOWN;
-      break;
 
-    case 0x0ff1:
-      element = EL_SPACESHIP_LEFT;
-      break;
+/* ------------------------------------------------------------------------- */
+/* functions for loading SP level                                            */
+/* ------------------------------------------------------------------------- */
 
-    case 0x0ff9:
-      element = EL_SPACESHIP_RIGHT;
-      break;
+void CopyNativeLevel_RND_to_SP(struct LevelInfo *level)
+{
+  struct LevelInfo_SP *level_sp = level->native_sp_level;
+  LevelInfoType *header = &level_sp->header;
+  int i, x, y;
 
-    case 0x1057:
-      element = EL_BUG_UP;
-      break;
+  level_sp->width  = level->fieldx;
+  level_sp->height = level->fieldy;
 
-    case 0x1060:
-      element = EL_BUG_DOWN;
-      break;
+  for (x = 0; x < level->fieldx; x++)
+    for (y = 0; y < level->fieldy; y++)
+      level_sp->playfield[x][y] = map_element_RND_to_SP(level->field[x][y]);
 
-    case 0x1078:
-      element = EL_BUG_LEFT;
-      break;
+  header->InitialGravity = (level->initial_player_gravity[0] ? 1 : 0);
 
-    case 0x1080:
-      element = EL_BUG_RIGHT;
-      break;
+  for (i = 0; i < SP_LEVEL_NAME_LEN; i++)
+    header->LevelTitle[i] = level->name[i];
+  /* !!! NO STRING TERMINATION IN SUPAPLEX VB CODE YET -- FIX THIS !!! */
 
-    case 0x10de:
-      element = EL_MOLE_UP;
-      break;
+  header->InfotronsNeeded = level->gems_needed;
 
-    case 0x10e7:
-      element = EL_MOLE_DOWN;
-      break;
+  header->SpecialPortCount = 0;
 
-    case 0x10ff:
-      element = EL_MOLE_LEFT;
-      break;
+  for (x = 0; x < level->fieldx; x++) for (y = 0; y < level->fieldy; y++)
+  {
+    boolean gravity_port_found = FALSE;
+    boolean gravity_port_valid = FALSE;
+    int gravity_port_flag;
+    int gravity_port_base_element;
+    int element = level->field[x][y];
 
-    case 0x1107:
-      element = EL_MOLE_RIGHT;
-      break;
+    if (element >= EL_SP_GRAVITY_ON_PORT_RIGHT &&
+       element <= EL_SP_GRAVITY_ON_PORT_UP)
+    {
+      gravity_port_found = TRUE;
+      gravity_port_valid = TRUE;
+      gravity_port_flag = 1;
+      gravity_port_base_element = EL_SP_GRAVITY_ON_PORT_RIGHT;
+    }
+    else if (element >= EL_SP_GRAVITY_OFF_PORT_RIGHT &&
+            element <= EL_SP_GRAVITY_OFF_PORT_UP)
+    {
+      gravity_port_found = TRUE;
+      gravity_port_valid = TRUE;
+      gravity_port_flag = 0;
+      gravity_port_base_element = EL_SP_GRAVITY_OFF_PORT_RIGHT;
+    }
+    else if (element >= EL_SP_GRAVITY_PORT_RIGHT &&
+            element <= EL_SP_GRAVITY_PORT_UP)
+    {
+      /* change R'n'D style gravity inverting special port to normal port
+        (there are no gravity inverting ports in native Supaplex engine) */
 
-    case 0x11c0:
-      element = EL_ROBOT;
-      break;
+      gravity_port_found = TRUE;
+      gravity_port_valid = FALSE;
+      gravity_port_base_element = EL_SP_GRAVITY_PORT_RIGHT;
+    }
 
-    case 0x13f5:
-      element = EL_YAMYAM;
-      break;
+    if (gravity_port_found)
+    {
+      if (gravity_port_valid &&
+         header->SpecialPortCount < SP_MAX_SPECIAL_PORTS)
+      {
+       SpecialPortType *port = &header->SpecialPort[header->SpecialPortCount];
 
-    case 0x1425:
-      element = EL_SWITCHGATE_OPEN;
-      break;
+       port->PortLocation = (y * level->fieldx + x) * 2;
+       port->Gravity = gravity_port_flag;
 
-    case 0x1426:
-      element = EL_SWITCHGATE_CLOSED;
-      break;
+       element += EL_SP_GRAVITY_PORT_RIGHT - gravity_port_base_element;
 
-    case 0x1437:
-      element = EL_DC_SWITCHGATE_SWITCH_UP;
-      break;
+       header->SpecialPortCount++;
+      }
+      else
+      {
+       /* change special gravity port to normal port */
 
-    case 0x143a:
-      element = EL_TIMEGATE_CLOSED;
-      break;
+       element += EL_SP_PORT_RIGHT - gravity_port_base_element;
+      }
 
-    case 0x144c:       /* conveyor belt switch (green) */
-      element = EL_CONVEYOR_BELT_3_SWITCH_MIDDLE;
-      break;
+      level_sp->playfield[x][y] = element - EL_SP_START;
+    }
+  }
+}
 
-    case 0x144f:       /* conveyor belt switch (red) */
-      element = EL_CONVEYOR_BELT_1_SWITCH_MIDDLE;
-      break;
+void CopyNativeLevel_SP_to_RND(struct LevelInfo *level)
+{
+  struct LevelInfo_SP *level_sp = level->native_sp_level;
+  LevelInfoType *header = &level_sp->header;
+  boolean num_invalid_elements = 0;
+  int i, j, x, y;
 
-    case 0x1452:       /* conveyor belt switch (blue) */
-      element = EL_CONVEYOR_BELT_4_SWITCH_MIDDLE;
-      break;
+  level->fieldx = level_sp->width;
+  level->fieldy = level_sp->height;
 
-    case 0x145b:
-      element = EL_CONVEYOR_BELT_3_MIDDLE;
-      break;
+  for (x = 0; x < level->fieldx; x++)
+  {
+    for (y = 0; y < level->fieldy; y++)
+    {
+      int element_old = level_sp->playfield[x][y];
+      int element_new = getMappedElement(map_element_SP_to_RND(element_old));
 
-    case 0x1463:
-      element = EL_CONVEYOR_BELT_3_LEFT;
-      break;
+      if (element_new == EL_UNKNOWN)
+      {
+       num_invalid_elements++;
 
-    case 0x146b:
-      element = EL_CONVEYOR_BELT_3_RIGHT;
-      break;
+       Error(ERR_DEBUG, "invalid element %d at position %d, %d",
+             element_old, x, y);
+      }
 
-    case 0x1473:
-      element = EL_CONVEYOR_BELT_1_MIDDLE;
-      break;
+      level->field[x][y] = element_new;
+    }
+  }
 
-    case 0x147b:
-      element = EL_CONVEYOR_BELT_1_LEFT;
-      break;
+  if (num_invalid_elements > 0)
+    Error(ERR_WARN, "found %d invalid elements%s", num_invalid_elements,
+         (!options.debug ? " (use '--debug' for more details)" : ""));
 
-    case 0x1483:
-      element = EL_CONVEYOR_BELT_1_RIGHT;
-      break;
+  for (i = 0; i < MAX_PLAYERS; i++)
+    level->initial_player_gravity[i] =
+      (header->InitialGravity == 1 ? TRUE : FALSE);
 
-    case 0x148b:
-      element = EL_CONVEYOR_BELT_4_MIDDLE;
+  /* skip leading spaces */
+  for (i = 0; i < SP_LEVEL_NAME_LEN; i++)
+    if (header->LevelTitle[i] != ' ')
       break;
 
-    case 0x1493:
-      element = EL_CONVEYOR_BELT_4_LEFT;
-      break;
+  /* copy level title */
+  for (j = 0; i < SP_LEVEL_NAME_LEN; i++, j++)
+    level->name[j] = header->LevelTitle[i];
+  level->name[j] = '\0';
 
-    case 0x149b:
-      element = EL_CONVEYOR_BELT_4_RIGHT;
-      break;
+  /* cut trailing spaces */
+  for (; j > 0; j--)
+    if (level->name[j - 1] == ' ' && level->name[j] == '\0')
+      level->name[j - 1] = '\0';
 
-    case 0x14ac:
-      element = EL_EXPANDABLE_WALL_HORIZONTAL;
-      break;
+  level->gems_needed = header->InfotronsNeeded;
 
-    case 0x14bd:
-      element = EL_EXPANDABLE_WALL_VERTICAL;
-      break;
+  for (i = 0; i < header->SpecialPortCount; i++)
+  {
+    SpecialPortType *port = &header->SpecialPort[i];
+    int port_location = port->PortLocation;
+    int gravity = port->Gravity;
+    int port_x, port_y, port_element;
 
-    case 0x14c6:
-      element = EL_EXPANDABLE_WALL_ANY;
-      break;
+    port_x = (port_location / 2) % level->fieldx;
+    port_y = (port_location / 2) / level->fieldx;
 
-    case 0x14ce:       /* growing steel wall (left/right) */
-      element = EL_EXPANDABLE_STEELWALL_HORIZONTAL;
-      break;
+    if (port_x < 0 || port_x >= level->fieldx ||
+       port_y < 0 || port_y >= level->fieldy)
+    {
+      Error(ERR_WARN, "special port position (%d, %d) out of bounds",
+           port_x, port_y);
 
-    case 0x14df:       /* growing steel wall (up/down) */
-      element = EL_EXPANDABLE_STEELWALL_VERTICAL;
-      break;
+      continue;
+    }
 
-    case 0x14e8:       /* growing steel wall (up/down/left/right) */
-      element = EL_EXPANDABLE_STEELWALL_ANY;
-      break;
+    port_element = level->field[port_x][port_y];
 
-    case 0x14e9:
-      element = EL_SHIELD_DEADLY;
-      break;
+    if (port_element < EL_SP_GRAVITY_PORT_RIGHT ||
+       port_element > EL_SP_GRAVITY_PORT_UP)
+    {
+      Error(ERR_WARN, "no special port at position (%d, %d)", port_x, port_y);
 
-    case 0x1501:
-      element = EL_EXTRA_TIME;
-      break;
+      continue;
+    }
 
-    case 0x154f:
-      element = EL_ACID;
-      break;
+    /* change previous (wrong) gravity inverting special port to either
+       gravity enabling special port or gravity disabling special port */
+    level->field[port_x][port_y] +=
+      (gravity == 1 ? EL_SP_GRAVITY_ON_PORT_RIGHT :
+       EL_SP_GRAVITY_OFF_PORT_RIGHT) - EL_SP_GRAVITY_PORT_RIGHT;
+  }
 
-    case 0x1577:
-      element = EL_EMPTY_SPACE;
-      break;
+  /* change special gravity ports without database entries to normal ports */
+  for (x = 0; x < level->fieldx; x++)
+    for (y = 0; y < level->fieldy; y++)
+      if (level->field[x][y] >= EL_SP_GRAVITY_PORT_RIGHT &&
+         level->field[x][y] <= EL_SP_GRAVITY_PORT_UP)
+       level->field[x][y] += EL_SP_PORT_RIGHT - EL_SP_GRAVITY_PORT_RIGHT;
 
-    case 0x1578:       /* quicksand (empty) */
-      element = EL_QUICKSAND_FAST_EMPTY;
-      break;
+  level->time = 0;                     /* no time limit */
+  level->amoeba_speed = 0;
+  level->time_magic_wall = 0;
+  level->time_wheel = 0;
+  level->amoeba_content = EL_EMPTY;
 
-    case 0x1579:       /* slow quicksand (empty) */
-      element = EL_QUICKSAND_EMPTY;
-      break;
+#if 1
+  /* original Supaplex does not use score values -- use default values */
+#else
+  for (i = 0; i < LEVEL_SCORE_ELEMENTS; i++)
+    level->score[i] = 0;
+#endif
 
-      /* 0x157c - 0x158b: */
-      /* EL_SAND */
+  /* there are no yamyams in supaplex levels */
+  for (i = 0; i < level->num_yamyam_contents; i++)
+    for (x = 0; x < 3; x++)
+      for (y = 0; y < 3; y++)
+       level->yamyam_content[i].e[x][y] = EL_EMPTY;
+}
 
-      /* 0x1590 - 0x159f: */
-      /* EL_DC_LANDMINE */
+static void CopyNativeTape_RND_to_SP(struct LevelInfo *level)
+{
+  struct LevelInfo_SP *level_sp = level->native_sp_level;
+  struct DemoInfo_SP *demo = &level_sp->demo;
+  int i, j;
 
-    case 0x15a0:
-      element = EL_EM_DYNAMITE;
-      break;
+  /* always start with reliable default values */
+  demo->is_available = FALSE;
+  demo->length = 0;
 
-    case 0x15a1:       /* key (red) */
-      element = EL_EM_KEY_1;
-      break;
+  if (TAPE_IS_EMPTY(tape))
+    return;
 
-    case 0x15a2:       /* key (yellow) */
-      element = EL_EM_KEY_2;
-      break;
+  demo->level_nr = tape.level_nr;      /* (currently not used) */
 
-    case 0x15a3:       /* key (blue) */
-      element = EL_EM_KEY_4;
-      break;
+  level_sp->header.DemoRandomSeed = tape.random_seed;
 
-    case 0x15a4:       /* key (green) */
-      element = EL_EM_KEY_3;
-      break;
+  demo->length = 0;
 
-    case 0x15a5:       /* key (white) */
-      element = EL_DC_KEY_WHITE;
-      break;
+  for (i = 0; i < tape.length; i++)
+  {
+    int demo_action = map_key_RND_to_SP(tape.pos[i].action[0]);
+    int demo_repeat = tape.pos[i].delay;
+    int demo_entries = (demo_repeat + 15) / 16;
 
-    case 0x15a6:
-      element = EL_WALL_SLIPPERY;
-      break;
+    if (demo->length + demo_entries >= SP_MAX_TAPE_LEN)
+    {
+      Error(ERR_WARN, "tape truncated: size exceeds maximum SP demo size %d",
+           SP_MAX_TAPE_LEN);
 
-    case 0x15a7:
-      element = EL_WALL;
       break;
+    }
 
-    case 0x15a8:       /* wall (not round) */
-      element = EL_WALL;
-      break;
+    for (j = 0; j < demo_repeat / 16; j++)
+      demo->data[demo->length++] = 0xf0 | demo_action;
 
-    case 0x15a9:       /* (blue) */
-      element = EL_CHAR_A;
-      break;
+    if (demo_repeat % 16)
+      demo->data[demo->length++] = ((demo_repeat % 16 - 1) << 4) | demo_action;
+  }
 
-    case 0x15aa:       /* (blue) */
-      element = EL_CHAR_B;
-      break;
+  demo->is_available = TRUE;
+}
 
-    case 0x15ab:       /* (blue) */
-      element = EL_CHAR_C;
-      break;
+static void setTapeInfoToDefaults();
 
-    case 0x15ac:       /* (blue) */
-      element = EL_CHAR_D;
-      break;
+static void CopyNativeTape_SP_to_RND(struct LevelInfo *level)
+{
+  struct LevelInfo_SP *level_sp = level->native_sp_level;
+  struct DemoInfo_SP *demo = &level_sp->demo;
+  char *filename = level->file_info.filename;
+  int i;
 
-    case 0x15ad:       /* (blue) */
-      element = EL_CHAR_E;
-      break;
+  /* always start with reliable default values */
+  setTapeInfoToDefaults();
 
-    case 0x15ae:       /* (blue) */
-      element = EL_CHAR_F;
-      break;
+  if (!demo->is_available)
+    return;
 
-    case 0x15af:       /* (blue) */
-      element = EL_CHAR_G;
-      break;
+  tape.level_nr = demo->level_nr;      /* (currently not used) */
+  tape.random_seed = level_sp->header.DemoRandomSeed;
 
-    case 0x15b0:       /* (blue) */
-      element = EL_CHAR_H;
-      break;
+  TapeSetDateFromEpochSeconds(getFileTimestampEpochSeconds(filename));
 
-    case 0x15b1:       /* (blue) */
-      element = EL_CHAR_I;
-      break;
+  tape.counter = 0;
+  tape.pos[tape.counter].delay = 0;
 
-    case 0x15b2:       /* (blue) */
-      element = EL_CHAR_J;
-      break;
+  for (i = 0; i < demo->length; i++)
+  {
+    int demo_action = demo->data[i] & 0x0f;
+    int demo_repeat = (demo->data[i] & 0xf0) >> 4;
+    int tape_action = map_key_SP_to_RND(demo_action);
+    int tape_repeat = demo_repeat + 1;
+    byte action[MAX_PLAYERS] = { tape_action, 0, 0, 0 };
+    boolean success = 0;
+    int j;
 
-    case 0x15b3:       /* (blue) */
-      element = EL_CHAR_K;
-      break;
+    for (j = 0; j < tape_repeat; j++)
+      success = TapeAddAction(action);
 
-    case 0x15b4:       /* (blue) */
-      element = EL_CHAR_L;
-      break;
+    if (!success)
+    {
+      Error(ERR_WARN, "SP demo truncated: size exceeds maximum tape size %d",
+           MAX_TAPE_LEN);
 
-    case 0x15b5:       /* (blue) */
-      element = EL_CHAR_M;
       break;
+    }
+  }
 
-    case 0x15b6:       /* (blue) */
-      element = EL_CHAR_N;
-      break;
+  TapeHaltRecording();
+}
 
-    case 0x15b7:       /* (blue) */
-      element = EL_CHAR_O;
-      break;
 
-    case 0x15b8:       /* (blue) */
-      element = EL_CHAR_P;
-      break;
+/* ------------------------------------------------------------------------- */
+/* functions for loading MM level                                            */
+/* ------------------------------------------------------------------------- */
 
-    case 0x15b9:       /* (blue) */
-      element = EL_CHAR_Q;
-      break;
+void CopyNativeLevel_RND_to_MM(struct LevelInfo *level)
+{
+  struct LevelInfo_MM *level_mm = level->native_mm_level;
+  int x, y;
 
-    case 0x15ba:       /* (blue) */
-      element = EL_CHAR_R;
-      break;
+  level_mm->fieldx = MIN(level->fieldx, MM_MAX_PLAYFIELD_WIDTH);
+  level_mm->fieldy = MIN(level->fieldy, MM_MAX_PLAYFIELD_HEIGHT);
 
-    case 0x15bb:       /* (blue) */
-      element = EL_CHAR_S;
-      break;
+  level_mm->time = level->time;
+  level_mm->kettles_needed = level->gems_needed;
+  level_mm->auto_count_kettles = level->auto_count_gems;
 
-    case 0x15bc:       /* (blue) */
-      element = EL_CHAR_T;
-      break;
+  level_mm->laser_red = level->mm_laser_red;
+  level_mm->laser_green = level->mm_laser_green;
+  level_mm->laser_blue = level->mm_laser_blue;
 
-    case 0x15bd:       /* (blue) */
-      element = EL_CHAR_U;
-      break;
+  strcpy(level_mm->name, level->name);
+  strcpy(level_mm->author, level->author);
 
-    case 0x15be:       /* (blue) */
-      element = EL_CHAR_V;
-      break;
+  level_mm->score[SC_EMERALD]    = level->score[SC_EMERALD];
+  level_mm->score[SC_PACMAN]     = level->score[SC_PACMAN];
+  level_mm->score[SC_KEY]        = level->score[SC_KEY];
+  level_mm->score[SC_TIME_BONUS] = level->score[SC_TIME_BONUS];
+  level_mm->score[SC_ELEM_BONUS] = level->score[SC_ELEM_BONUS];
 
-    case 0x15bf:       /* (blue) */
-      element = EL_CHAR_W;
-      break;
+  level_mm->amoeba_speed = level->amoeba_speed;
+  level_mm->time_fuse    = level->mm_time_fuse;
+  level_mm->time_bomb    = level->mm_time_bomb;
+  level_mm->time_ball    = level->mm_time_ball;
+  level_mm->time_block   = level->mm_time_block;
 
-    case 0x15c0:       /* (blue) */
-      element = EL_CHAR_X;
-      break;
+  for (x = 0; x < level->fieldx; x++)
+    for (y = 0; y < level->fieldy; y++)
+      Ur[x][y] =
+       level_mm->field[x][y] = map_element_RND_to_MM(level->field[x][y]);
+}
 
-    case 0x15c1:       /* (blue) */
-      element = EL_CHAR_Y;
-      break;
+void CopyNativeLevel_MM_to_RND(struct LevelInfo *level)
+{
+  struct LevelInfo_MM *level_mm = level->native_mm_level;
+  int x, y;
 
-    case 0x15c2:       /* (blue) */
-      element = EL_CHAR_Z;
-      break;
+  level->fieldx = MIN(level_mm->fieldx, MAX_LEV_FIELDX);
+  level->fieldy = MIN(level_mm->fieldy, MAX_LEV_FIELDY);
 
-    case 0x15c3:       /* (blue) */
-      element = EL_CHAR_AUMLAUT;
-      break;
+  level->time = level_mm->time;
+  level->gems_needed = level_mm->kettles_needed;
+  level->auto_count_gems = level_mm->auto_count_kettles;
 
-    case 0x15c4:       /* (blue) */
-      element = EL_CHAR_OUMLAUT;
-      break;
+  level->mm_laser_red = level_mm->laser_red;
+  level->mm_laser_green = level_mm->laser_green;
+  level->mm_laser_blue = level_mm->laser_blue;
 
-    case 0x15c5:       /* (blue) */
-      element = EL_CHAR_UUMLAUT;
-      break;
+  strcpy(level->name, level_mm->name);
 
-    case 0x15c6:       /* (blue) */
-      element = EL_CHAR_0;
-      break;
+  /* only overwrite author from 'levelinfo.conf' if author defined in level */
+  if (!strEqual(level_mm->author, ANONYMOUS_NAME))
+    strcpy(level->author, level_mm->author);
 
-    case 0x15c7:       /* (blue) */
-      element = EL_CHAR_1;
-      break;
+  level->score[SC_EMERALD]    = level_mm->score[SC_EMERALD];
+  level->score[SC_PACMAN]     = level_mm->score[SC_PACMAN];
+  level->score[SC_KEY]        = level_mm->score[SC_KEY];
+  level->score[SC_TIME_BONUS] = level_mm->score[SC_TIME_BONUS];
+  level->score[SC_ELEM_BONUS] = level_mm->score[SC_ELEM_BONUS];
 
-    case 0x15c8:       /* (blue) */
-      element = EL_CHAR_2;
-      break;
+  level->amoeba_speed  = level_mm->amoeba_speed;
+  level->mm_time_fuse  = level_mm->time_fuse;
+  level->mm_time_bomb  = level_mm->time_bomb;
+  level->mm_time_ball  = level_mm->time_ball;
+  level->mm_time_block = level_mm->time_block;
 
-    case 0x15c9:       /* (blue) */
-      element = EL_CHAR_3;
-      break;
+  for (x = 0; x < level->fieldx; x++)
+    for (y = 0; y < level->fieldy; y++)
+      level->field[x][y] = map_element_MM_to_RND(level_mm->field[x][y]);
+}
 
-    case 0x15ca:       /* (blue) */
-      element = EL_CHAR_4;
-      break;
 
-    case 0x15cb:       /* (blue) */
-      element = EL_CHAR_5;
-      break;
+/* ------------------------------------------------------------------------- */
+/* functions for loading DC level                                            */
+/* ------------------------------------------------------------------------- */
 
-    case 0x15cc:       /* (blue) */
-      element = EL_CHAR_6;
-      break;
+#define DC_LEVEL_HEADER_SIZE           344
 
-    case 0x15cd:       /* (blue) */
-      element = EL_CHAR_7;
-      break;
+unsigned short getDecodedWord_DC(unsigned short data_encoded, boolean init)
+{
+  static int last_data_encoded;
+  static int offset1;
+  static int offset2;
+  int diff;
+  int diff_hi, diff_lo;
+  int data_hi, data_lo;
+  unsigned short data_decoded;
 
-    case 0x15ce:       /* (blue) */
-      element = EL_CHAR_8;
-      break;
+  if (init)
+  {
+    last_data_encoded = 0;
+    offset1 = -1;
+    offset2 = 0;
 
-    case 0x15cf:       /* (blue) */
-      element = EL_CHAR_9;
-      break;
+    return 0;
+  }
 
-    case 0x15d0:       /* (blue) */
-      element = EL_CHAR_PERIOD;
-      break;
+  diff = data_encoded - last_data_encoded;
+  diff_hi = diff & ~0xff;
+  diff_lo = diff &  0xff;
 
-    case 0x15d1:       /* (blue) */
-      element = EL_CHAR_EXCLAM;
-      break;
+  offset2 += diff_lo;
 
-    case 0x15d2:       /* (blue) */
-      element = EL_CHAR_COLON;
-      break;
+  data_hi = diff_hi - (offset1 << 8) + (offset2 & 0xff00);
+  data_lo = (diff_lo + (data_hi >> 16)) & 0x00ff;
+  data_hi = data_hi & 0xff00;
 
-    case 0x15d3:       /* (blue) */
-      element = EL_CHAR_LESS;
-      break;
+  data_decoded = data_hi | data_lo;
 
-    case 0x15d4:       /* (blue) */
-      element = EL_CHAR_GREATER;
-      break;
+  last_data_encoded = data_encoded;
 
-    case 0x15d5:       /* (blue) */
-      element = EL_CHAR_QUESTION;
-      break;
+  offset1 = (offset1 + 1) % 31;
+  offset2 = offset2 & 0xff;
 
-    case 0x15d6:       /* (blue) */
-      element = EL_CHAR_COPYRIGHT;
-      break;
+  return data_decoded;
+}
 
-    case 0x15d7:       /* (blue) */
-      element = EL_CHAR_UP;
+int getMappedElement_DC(int element)
+{
+  switch (element)
+  {
+    case 0x0000:
+      element = EL_ROCK;
       break;
 
-    case 0x15d8:       /* (blue) */
-      element = EL_CHAR_DOWN;
-      break;
+      /* 0x0117 - 0x036e: (?) */
+      /* EL_DIAMOND */
 
-    case 0x15d9:       /* (blue) */
-      element = EL_CHAR_BUTTON;
+      /* 0x042d - 0x0684: (?) */
+      /* EL_EMERALD */
+
+    case 0x06f1:
+      element = EL_NUT;
       break;
 
-    case 0x15da:       /* (blue) */
-      element = EL_CHAR_PLUS;
+    case 0x074c:
+      element = EL_BOMB;
       break;
 
-    case 0x15db:       /* (blue) */
-      element = EL_CHAR_MINUS;
+    case 0x07a4:
+      element = EL_PEARL;
       break;
 
-    case 0x15dc:       /* (blue) */
-      element = EL_CHAR_APOSTROPHE;
+    case 0x0823:
+      element = EL_CRYSTAL;
       break;
 
-    case 0x15dd:       /* (blue) */
-      element = EL_CHAR_PARENLEFT;
+    case 0x0e77:       /* quicksand (boulder) */
+      element = EL_QUICKSAND_FAST_FULL;
       break;
 
-    case 0x15de:       /* (blue) */
-      element = EL_CHAR_PARENRIGHT;
+    case 0x0e99:       /* slow quicksand (boulder) */
+      element = EL_QUICKSAND_FULL;
       break;
 
-    case 0x15df:       /* (green) */
-      element = EL_CHAR_A;
+    case 0x0ed2:
+      element = EL_EM_EXIT_OPEN;
       break;
 
-    case 0x15e0:       /* (green) */
-      element = EL_CHAR_B;
+    case 0x0ee3:
+      element = EL_EM_EXIT_CLOSED;
       break;
 
-    case 0x15e1:       /* (green) */
-      element = EL_CHAR_C;
+    case 0x0eeb:
+      element = EL_EM_STEEL_EXIT_OPEN;
       break;
 
-    case 0x15e2:       /* (green) */
-      element = EL_CHAR_D;
+    case 0x0efc:
+      element = EL_EM_STEEL_EXIT_CLOSED;
       break;
 
-    case 0x15e3:       /* (green) */
-      element = EL_CHAR_E;
+    case 0x0f4f:       /* dynamite (lit 1) */
+      element = EL_EM_DYNAMITE_ACTIVE;
       break;
 
-    case 0x15e4:       /* (green) */
-      element = EL_CHAR_F;
+    case 0x0f57:       /* dynamite (lit 2) */
+      element = EL_EM_DYNAMITE_ACTIVE;
       break;
 
-    case 0x15e5:       /* (green) */
-      element = EL_CHAR_G;
+    case 0x0f5f:       /* dynamite (lit 3) */
+      element = EL_EM_DYNAMITE_ACTIVE;
       break;
 
-    case 0x15e6:       /* (green) */
-      element = EL_CHAR_H;
+    case 0x0f67:       /* dynamite (lit 4) */
+      element = EL_EM_DYNAMITE_ACTIVE;
       break;
 
-    case 0x15e7:       /* (green) */
-      element = EL_CHAR_I;
+    case 0x0f81:
+    case 0x0f82:
+    case 0x0f83:
+    case 0x0f84:
+      element = EL_AMOEBA_WET;
       break;
 
-    case 0x15e8:       /* (green) */
-      element = EL_CHAR_J;
+    case 0x0f85:
+      element = EL_AMOEBA_DROP;
       break;
 
-    case 0x15e9:       /* (green) */
-      element = EL_CHAR_K;
+    case 0x0fb9:
+      element = EL_DC_MAGIC_WALL;
       break;
 
-    case 0x15ea:       /* (green) */
-      element = EL_CHAR_L;
+    case 0x0fd0:
+      element = EL_SPACESHIP_UP;
       break;
 
-    case 0x15eb:       /* (green) */
-      element = EL_CHAR_M;
+    case 0x0fd9:
+      element = EL_SPACESHIP_DOWN;
       break;
 
-    case 0x15ec:       /* (green) */
-      element = EL_CHAR_N;
+    case 0x0ff1:
+      element = EL_SPACESHIP_LEFT;
       break;
 
-    case 0x15ed:       /* (green) */
-      element = EL_CHAR_O;
+    case 0x0ff9:
+      element = EL_SPACESHIP_RIGHT;
       break;
 
-    case 0x15ee:       /* (green) */
-      element = EL_CHAR_P;
+    case 0x1057:
+      element = EL_BUG_UP;
       break;
 
-    case 0x15ef:       /* (green) */
-      element = EL_CHAR_Q;
+    case 0x1060:
+      element = EL_BUG_DOWN;
       break;
 
-    case 0x15f0:       /* (green) */
-      element = EL_CHAR_R;
+    case 0x1078:
+      element = EL_BUG_LEFT;
       break;
 
-    case 0x15f1:       /* (green) */
-      element = EL_CHAR_S;
+    case 0x1080:
+      element = EL_BUG_RIGHT;
       break;
 
-    case 0x15f2:       /* (green) */
-      element = EL_CHAR_T;
+    case 0x10de:
+      element = EL_MOLE_UP;
       break;
 
-    case 0x15f3:       /* (green) */
-      element = EL_CHAR_U;
+    case 0x10e7:
+      element = EL_MOLE_DOWN;
       break;
 
-    case 0x15f4:       /* (green) */
-      element = EL_CHAR_V;
+    case 0x10ff:
+      element = EL_MOLE_LEFT;
       break;
 
-    case 0x15f5:       /* (green) */
-      element = EL_CHAR_W;
+    case 0x1107:
+      element = EL_MOLE_RIGHT;
       break;
 
-    case 0x15f6:       /* (green) */
-      element = EL_CHAR_X;
+    case 0x11c0:
+      element = EL_ROBOT;
       break;
 
-    case 0x15f7:       /* (green) */
-      element = EL_CHAR_Y;
+    case 0x13f5:
+      element = EL_YAMYAM;
       break;
 
-    case 0x15f8:       /* (green) */
-      element = EL_CHAR_Z;
+    case 0x1425:
+      element = EL_SWITCHGATE_OPEN;
       break;
 
-    case 0x15f9:       /* (green) */
-      element = EL_CHAR_AUMLAUT;
+    case 0x1426:
+      element = EL_SWITCHGATE_CLOSED;
       break;
 
-    case 0x15fa:       /* (green) */
-      element = EL_CHAR_OUMLAUT;
+    case 0x1437:
+      element = EL_DC_SWITCHGATE_SWITCH_UP;
       break;
 
-    case 0x15fb:       /* (green) */
-      element = EL_CHAR_UUMLAUT;
+    case 0x143a:
+      element = EL_TIMEGATE_CLOSED;
       break;
 
-    case 0x15fc:       /* (green) */
-      element = EL_CHAR_0;
+    case 0x144c:       /* conveyor belt switch (green) */
+      element = EL_CONVEYOR_BELT_3_SWITCH_MIDDLE;
       break;
 
-    case 0x15fd:       /* (green) */
-      element = EL_CHAR_1;
+    case 0x144f:       /* conveyor belt switch (red) */
+      element = EL_CONVEYOR_BELT_1_SWITCH_MIDDLE;
       break;
 
-    case 0x15fe:       /* (green) */
-      element = EL_CHAR_2;
+    case 0x1452:       /* conveyor belt switch (blue) */
+      element = EL_CONVEYOR_BELT_4_SWITCH_MIDDLE;
       break;
 
-    case 0x15ff:       /* (green) */
-      element = EL_CHAR_3;
+    case 0x145b:
+      element = EL_CONVEYOR_BELT_3_MIDDLE;
       break;
 
-    case 0x1600:       /* (green) */
-      element = EL_CHAR_4;
+    case 0x1463:
+      element = EL_CONVEYOR_BELT_3_LEFT;
       break;
 
-    case 0x1601:       /* (green) */
-      element = EL_CHAR_5;
+    case 0x146b:
+      element = EL_CONVEYOR_BELT_3_RIGHT;
       break;
 
-    case 0x1602:       /* (green) */
-      element = EL_CHAR_6;
+    case 0x1473:
+      element = EL_CONVEYOR_BELT_1_MIDDLE;
       break;
 
-    case 0x1603:       /* (green) */
-      element = EL_CHAR_7;
+    case 0x147b:
+      element = EL_CONVEYOR_BELT_1_LEFT;
       break;
 
-    case 0x1604:       /* (green) */
-      element = EL_CHAR_8;
+    case 0x1483:
+      element = EL_CONVEYOR_BELT_1_RIGHT;
       break;
 
-    case 0x1605:       /* (green) */
-      element = EL_CHAR_9;
+    case 0x148b:
+      element = EL_CONVEYOR_BELT_4_MIDDLE;
       break;
 
-    case 0x1606:       /* (green) */
-      element = EL_CHAR_PERIOD;
+    case 0x1493:
+      element = EL_CONVEYOR_BELT_4_LEFT;
       break;
 
-    case 0x1607:       /* (green) */
-      element = EL_CHAR_EXCLAM;
+    case 0x149b:
+      element = EL_CONVEYOR_BELT_4_RIGHT;
       break;
 
-    case 0x1608:       /* (green) */
-      element = EL_CHAR_COLON;
+    case 0x14ac:
+      element = EL_EXPANDABLE_WALL_HORIZONTAL;
       break;
 
-    case 0x1609:       /* (green) */
-      element = EL_CHAR_LESS;
+    case 0x14bd:
+      element = EL_EXPANDABLE_WALL_VERTICAL;
       break;
 
-    case 0x160a:       /* (green) */
-      element = EL_CHAR_GREATER;
+    case 0x14c6:
+      element = EL_EXPANDABLE_WALL_ANY;
       break;
 
-    case 0x160b:       /* (green) */
-      element = EL_CHAR_QUESTION;
+    case 0x14ce:       /* growing steel wall (left/right) */
+      element = EL_EXPANDABLE_STEELWALL_HORIZONTAL;
       break;
 
-    case 0x160c:       /* (green) */
-      element = EL_CHAR_COPYRIGHT;
+    case 0x14df:       /* growing steel wall (up/down) */
+      element = EL_EXPANDABLE_STEELWALL_VERTICAL;
       break;
 
-    case 0x160d:       /* (green) */
-      element = EL_CHAR_UP;
+    case 0x14e8:       /* growing steel wall (up/down/left/right) */
+      element = EL_EXPANDABLE_STEELWALL_ANY;
       break;
 
-    case 0x160e:       /* (green) */
-      element = EL_CHAR_DOWN;
+    case 0x14e9:
+      element = EL_SHIELD_DEADLY;
       break;
 
-    case 0x160f:       /* (green) */
-      element = EL_CHAR_BUTTON;
+    case 0x1501:
+      element = EL_EXTRA_TIME;
       break;
 
-    case 0x1610:       /* (green) */
-      element = EL_CHAR_PLUS;
+    case 0x154f:
+      element = EL_ACID;
       break;
 
-    case 0x1611:       /* (green) */
-      element = EL_CHAR_MINUS;
+    case 0x1577:
+      element = EL_EMPTY_SPACE;
       break;
 
-    case 0x1612:       /* (green) */
-      element = EL_CHAR_APOSTROPHE;
+    case 0x1578:       /* quicksand (empty) */
+      element = EL_QUICKSAND_FAST_EMPTY;
       break;
 
-    case 0x1613:       /* (green) */
-      element = EL_CHAR_PARENLEFT;
+    case 0x1579:       /* slow quicksand (empty) */
+      element = EL_QUICKSAND_EMPTY;
       break;
 
-    case 0x1614:       /* (green) */
-      element = EL_CHAR_PARENRIGHT;
-      break;
+      /* 0x157c - 0x158b: */
+      /* EL_SAND */
 
-    case 0x1615:       /* (blue steel) */
-      element = EL_STEEL_CHAR_A;
+      /* 0x1590 - 0x159f: */
+      /* EL_DC_LANDMINE */
+
+    case 0x15a0:
+      element = EL_EM_DYNAMITE;
       break;
 
-    case 0x1616:       /* (blue steel) */
-      element = EL_STEEL_CHAR_B;
+    case 0x15a1:       /* key (red) */
+      element = EL_EM_KEY_1;
       break;
 
-    case 0x1617:       /* (blue steel) */
-      element = EL_STEEL_CHAR_C;
+    case 0x15a2:       /* key (yellow) */
+      element = EL_EM_KEY_2;
       break;
 
-    case 0x1618:       /* (blue steel) */
-      element = EL_STEEL_CHAR_D;
+    case 0x15a3:       /* key (blue) */
+      element = EL_EM_KEY_4;
       break;
 
-    case 0x1619:       /* (blue steel) */
-      element = EL_STEEL_CHAR_E;
+    case 0x15a4:       /* key (green) */
+      element = EL_EM_KEY_3;
       break;
 
-    case 0x161a:       /* (blue steel) */
-      element = EL_STEEL_CHAR_F;
+    case 0x15a5:       /* key (white) */
+      element = EL_DC_KEY_WHITE;
       break;
 
-    case 0x161b:       /* (blue steel) */
-      element = EL_STEEL_CHAR_G;
+    case 0x15a6:
+      element = EL_WALL_SLIPPERY;
       break;
 
-    case 0x161c:       /* (blue steel) */
-      element = EL_STEEL_CHAR_H;
+    case 0x15a7:
+      element = EL_WALL;
       break;
 
-    case 0x161d:       /* (blue steel) */
-      element = EL_STEEL_CHAR_I;
+    case 0x15a8:       /* wall (not round) */
+      element = EL_WALL;
       break;
 
-    case 0x161e:       /* (blue steel) */
-      element = EL_STEEL_CHAR_J;
+    case 0x15a9:       /* (blue) */
+      element = EL_CHAR_A;
       break;
 
-    case 0x161f:       /* (blue steel) */
-      element = EL_STEEL_CHAR_K;
+    case 0x15aa:       /* (blue) */
+      element = EL_CHAR_B;
       break;
 
-    case 0x1620:       /* (blue steel) */
-      element = EL_STEEL_CHAR_L;
+    case 0x15ab:       /* (blue) */
+      element = EL_CHAR_C;
       break;
 
-    case 0x1621:       /* (blue steel) */
-      element = EL_STEEL_CHAR_M;
+    case 0x15ac:       /* (blue) */
+      element = EL_CHAR_D;
       break;
 
-    case 0x1622:       /* (blue steel) */
-      element = EL_STEEL_CHAR_N;
+    case 0x15ad:       /* (blue) */
+      element = EL_CHAR_E;
       break;
 
-    case 0x1623:       /* (blue steel) */
-      element = EL_STEEL_CHAR_O;
+    case 0x15ae:       /* (blue) */
+      element = EL_CHAR_F;
       break;
 
-    case 0x1624:       /* (blue steel) */
-      element = EL_STEEL_CHAR_P;
+    case 0x15af:       /* (blue) */
+      element = EL_CHAR_G;
       break;
 
-    case 0x1625:       /* (blue steel) */
-      element = EL_STEEL_CHAR_Q;
+    case 0x15b0:       /* (blue) */
+      element = EL_CHAR_H;
       break;
 
-    case 0x1626:       /* (blue steel) */
-      element = EL_STEEL_CHAR_R;
+    case 0x15b1:       /* (blue) */
+      element = EL_CHAR_I;
       break;
 
-    case 0x1627:       /* (blue steel) */
-      element = EL_STEEL_CHAR_S;
+    case 0x15b2:       /* (blue) */
+      element = EL_CHAR_J;
       break;
 
-    case 0x1628:       /* (blue steel) */
-      element = EL_STEEL_CHAR_T;
+    case 0x15b3:       /* (blue) */
+      element = EL_CHAR_K;
       break;
 
-    case 0x1629:       /* (blue steel) */
-      element = EL_STEEL_CHAR_U;
+    case 0x15b4:       /* (blue) */
+      element = EL_CHAR_L;
       break;
 
-    case 0x162a:       /* (blue steel) */
-      element = EL_STEEL_CHAR_V;
+    case 0x15b5:       /* (blue) */
+      element = EL_CHAR_M;
       break;
 
-    case 0x162b:       /* (blue steel) */
-      element = EL_STEEL_CHAR_W;
+    case 0x15b6:       /* (blue) */
+      element = EL_CHAR_N;
       break;
 
-    case 0x162c:       /* (blue steel) */
-      element = EL_STEEL_CHAR_X;
+    case 0x15b7:       /* (blue) */
+      element = EL_CHAR_O;
       break;
 
-    case 0x162d:       /* (blue steel) */
-      element = EL_STEEL_CHAR_Y;
+    case 0x15b8:       /* (blue) */
+      element = EL_CHAR_P;
       break;
 
-    case 0x162e:       /* (blue steel) */
-      element = EL_STEEL_CHAR_Z;
+    case 0x15b9:       /* (blue) */
+      element = EL_CHAR_Q;
       break;
 
-    case 0x162f:       /* (blue steel) */
-      element = EL_STEEL_CHAR_AUMLAUT;
+    case 0x15ba:       /* (blue) */
+      element = EL_CHAR_R;
       break;
 
-    case 0x1630:       /* (blue steel) */
-      element = EL_STEEL_CHAR_OUMLAUT;
+    case 0x15bb:       /* (blue) */
+      element = EL_CHAR_S;
       break;
 
-    case 0x1631:       /* (blue steel) */
-      element = EL_STEEL_CHAR_UUMLAUT;
+    case 0x15bc:       /* (blue) */
+      element = EL_CHAR_T;
       break;
 
-    case 0x1632:       /* (blue steel) */
-      element = EL_STEEL_CHAR_0;
+    case 0x15bd:       /* (blue) */
+      element = EL_CHAR_U;
       break;
 
-    case 0x1633:       /* (blue steel) */
-      element = EL_STEEL_CHAR_1;
+    case 0x15be:       /* (blue) */
+      element = EL_CHAR_V;
       break;
 
-    case 0x1634:       /* (blue steel) */
-      element = EL_STEEL_CHAR_2;
+    case 0x15bf:       /* (blue) */
+      element = EL_CHAR_W;
       break;
 
-    case 0x1635:       /* (blue steel) */
-      element = EL_STEEL_CHAR_3;
+    case 0x15c0:       /* (blue) */
+      element = EL_CHAR_X;
       break;
 
-    case 0x1636:       /* (blue steel) */
-      element = EL_STEEL_CHAR_4;
+    case 0x15c1:       /* (blue) */
+      element = EL_CHAR_Y;
       break;
 
-    case 0x1637:       /* (blue steel) */
-      element = EL_STEEL_CHAR_5;
+    case 0x15c2:       /* (blue) */
+      element = EL_CHAR_Z;
       break;
 
-    case 0x1638:       /* (blue steel) */
-      element = EL_STEEL_CHAR_6;
+    case 0x15c3:       /* (blue) */
+      element = EL_CHAR_AUMLAUT;
       break;
 
-    case 0x1639:       /* (blue steel) */
-      element = EL_STEEL_CHAR_7;
+    case 0x15c4:       /* (blue) */
+      element = EL_CHAR_OUMLAUT;
       break;
 
-    case 0x163a:       /* (blue steel) */
-      element = EL_STEEL_CHAR_8;
+    case 0x15c5:       /* (blue) */
+      element = EL_CHAR_UUMLAUT;
       break;
 
-    case 0x163b:       /* (blue steel) */
-      element = EL_STEEL_CHAR_9;
+    case 0x15c6:       /* (blue) */
+      element = EL_CHAR_0;
       break;
 
-    case 0x163c:       /* (blue steel) */
-      element = EL_STEEL_CHAR_PERIOD;
+    case 0x15c7:       /* (blue) */
+      element = EL_CHAR_1;
       break;
 
-    case 0x163d:       /* (blue steel) */
-      element = EL_STEEL_CHAR_EXCLAM;
+    case 0x15c8:       /* (blue) */
+      element = EL_CHAR_2;
       break;
 
-    case 0x163e:       /* (blue steel) */
-      element = EL_STEEL_CHAR_COLON;
+    case 0x15c9:       /* (blue) */
+      element = EL_CHAR_3;
       break;
 
-    case 0x163f:       /* (blue steel) */
-      element = EL_STEEL_CHAR_LESS;
+    case 0x15ca:       /* (blue) */
+      element = EL_CHAR_4;
       break;
 
-    case 0x1640:       /* (blue steel) */
-      element = EL_STEEL_CHAR_GREATER;
+    case 0x15cb:       /* (blue) */
+      element = EL_CHAR_5;
       break;
 
-    case 0x1641:       /* (blue steel) */
-      element = EL_STEEL_CHAR_QUESTION;
+    case 0x15cc:       /* (blue) */
+      element = EL_CHAR_6;
       break;
 
-    case 0x1642:       /* (blue steel) */
-      element = EL_STEEL_CHAR_COPYRIGHT;
+    case 0x15cd:       /* (blue) */
+      element = EL_CHAR_7;
       break;
 
-    case 0x1643:       /* (blue steel) */
-      element = EL_STEEL_CHAR_UP;
+    case 0x15ce:       /* (blue) */
+      element = EL_CHAR_8;
       break;
 
-    case 0x1644:       /* (blue steel) */
-      element = EL_STEEL_CHAR_DOWN;
+    case 0x15cf:       /* (blue) */
+      element = EL_CHAR_9;
       break;
 
-    case 0x1645:       /* (blue steel) */
-      element = EL_STEEL_CHAR_BUTTON;
+    case 0x15d0:       /* (blue) */
+      element = EL_CHAR_PERIOD;
       break;
 
-    case 0x1646:       /* (blue steel) */
-      element = EL_STEEL_CHAR_PLUS;
+    case 0x15d1:       /* (blue) */
+      element = EL_CHAR_EXCLAM;
       break;
 
-    case 0x1647:       /* (blue steel) */
-      element = EL_STEEL_CHAR_MINUS;
+    case 0x15d2:       /* (blue) */
+      element = EL_CHAR_COLON;
       break;
 
-    case 0x1648:       /* (blue steel) */
-      element = EL_STEEL_CHAR_APOSTROPHE;
+    case 0x15d3:       /* (blue) */
+      element = EL_CHAR_LESS;
       break;
 
-    case 0x1649:       /* (blue steel) */
-      element = EL_STEEL_CHAR_PARENLEFT;
+    case 0x15d4:       /* (blue) */
+      element = EL_CHAR_GREATER;
       break;
 
-    case 0x164a:       /* (blue steel) */
-      element = EL_STEEL_CHAR_PARENRIGHT;
+    case 0x15d5:       /* (blue) */
+      element = EL_CHAR_QUESTION;
       break;
 
-    case 0x164b:       /* (green steel) */
-      element = EL_STEEL_CHAR_A;
+    case 0x15d6:       /* (blue) */
+      element = EL_CHAR_COPYRIGHT;
       break;
 
-    case 0x164c:       /* (green steel) */
-      element = EL_STEEL_CHAR_B;
+    case 0x15d7:       /* (blue) */
+      element = EL_CHAR_UP;
       break;
 
-    case 0x164d:       /* (green steel) */
-      element = EL_STEEL_CHAR_C;
+    case 0x15d8:       /* (blue) */
+      element = EL_CHAR_DOWN;
       break;
 
-    case 0x164e:       /* (green steel) */
-      element = EL_STEEL_CHAR_D;
+    case 0x15d9:       /* (blue) */
+      element = EL_CHAR_BUTTON;
       break;
 
-    case 0x164f:       /* (green steel) */
-      element = EL_STEEL_CHAR_E;
+    case 0x15da:       /* (blue) */
+      element = EL_CHAR_PLUS;
       break;
 
-    case 0x1650:       /* (green steel) */
-      element = EL_STEEL_CHAR_F;
+    case 0x15db:       /* (blue) */
+      element = EL_CHAR_MINUS;
       break;
 
-    case 0x1651:       /* (green steel) */
-      element = EL_STEEL_CHAR_G;
+    case 0x15dc:       /* (blue) */
+      element = EL_CHAR_APOSTROPHE;
       break;
 
-    case 0x1652:       /* (green steel) */
-      element = EL_STEEL_CHAR_H;
+    case 0x15dd:       /* (blue) */
+      element = EL_CHAR_PARENLEFT;
       break;
 
-    case 0x1653:       /* (green steel) */
-      element = EL_STEEL_CHAR_I;
+    case 0x15de:       /* (blue) */
+      element = EL_CHAR_PARENRIGHT;
       break;
 
-    case 0x1654:       /* (green steel) */
-      element = EL_STEEL_CHAR_J;
+    case 0x15df:       /* (green) */
+      element = EL_CHAR_A;
       break;
 
-    case 0x1655:       /* (green steel) */
-      element = EL_STEEL_CHAR_K;
+    case 0x15e0:       /* (green) */
+      element = EL_CHAR_B;
       break;
 
-    case 0x1656:       /* (green steel) */
-      element = EL_STEEL_CHAR_L;
+    case 0x15e1:       /* (green) */
+      element = EL_CHAR_C;
       break;
 
-    case 0x1657:       /* (green steel) */
-      element = EL_STEEL_CHAR_M;
+    case 0x15e2:       /* (green) */
+      element = EL_CHAR_D;
       break;
 
-    case 0x1658:       /* (green steel) */
-      element = EL_STEEL_CHAR_N;
+    case 0x15e3:       /* (green) */
+      element = EL_CHAR_E;
       break;
 
-    case 0x1659:       /* (green steel) */
-      element = EL_STEEL_CHAR_O;
+    case 0x15e4:       /* (green) */
+      element = EL_CHAR_F;
       break;
 
-    case 0x165a:       /* (green steel) */
-      element = EL_STEEL_CHAR_P;
+    case 0x15e5:       /* (green) */
+      element = EL_CHAR_G;
       break;
 
-    case 0x165b:       /* (green steel) */
-      element = EL_STEEL_CHAR_Q;
+    case 0x15e6:       /* (green) */
+      element = EL_CHAR_H;
       break;
 
-    case 0x165c:       /* (green steel) */
-      element = EL_STEEL_CHAR_R;
+    case 0x15e7:       /* (green) */
+      element = EL_CHAR_I;
       break;
 
-    case 0x165d:       /* (green steel) */
-      element = EL_STEEL_CHAR_S;
+    case 0x15e8:       /* (green) */
+      element = EL_CHAR_J;
       break;
 
-    case 0x165e:       /* (green steel) */
-      element = EL_STEEL_CHAR_T;
+    case 0x15e9:       /* (green) */
+      element = EL_CHAR_K;
       break;
 
-    case 0x165f:       /* (green steel) */
-      element = EL_STEEL_CHAR_U;
+    case 0x15ea:       /* (green) */
+      element = EL_CHAR_L;
       break;
 
-    case 0x1660:       /* (green steel) */
-      element = EL_STEEL_CHAR_V;
+    case 0x15eb:       /* (green) */
+      element = EL_CHAR_M;
       break;
 
-    case 0x1661:       /* (green steel) */
-      element = EL_STEEL_CHAR_W;
+    case 0x15ec:       /* (green) */
+      element = EL_CHAR_N;
       break;
 
-    case 0x1662:       /* (green steel) */
-      element = EL_STEEL_CHAR_X;
+    case 0x15ed:       /* (green) */
+      element = EL_CHAR_O;
       break;
 
-    case 0x1663:       /* (green steel) */
-      element = EL_STEEL_CHAR_Y;
+    case 0x15ee:       /* (green) */
+      element = EL_CHAR_P;
       break;
 
-    case 0x1664:       /* (green steel) */
-      element = EL_STEEL_CHAR_Z;
+    case 0x15ef:       /* (green) */
+      element = EL_CHAR_Q;
       break;
 
-    case 0x1665:       /* (green steel) */
-      element = EL_STEEL_CHAR_AUMLAUT;
+    case 0x15f0:       /* (green) */
+      element = EL_CHAR_R;
       break;
 
-    case 0x1666:       /* (green steel) */
-      element = EL_STEEL_CHAR_OUMLAUT;
+    case 0x15f1:       /* (green) */
+      element = EL_CHAR_S;
       break;
 
-    case 0x1667:       /* (green steel) */
-      element = EL_STEEL_CHAR_UUMLAUT;
+    case 0x15f2:       /* (green) */
+      element = EL_CHAR_T;
       break;
 
-    case 0x1668:       /* (green steel) */
-      element = EL_STEEL_CHAR_0;
+    case 0x15f3:       /* (green) */
+      element = EL_CHAR_U;
       break;
 
-    case 0x1669:       /* (green steel) */
-      element = EL_STEEL_CHAR_1;
+    case 0x15f4:       /* (green) */
+      element = EL_CHAR_V;
       break;
 
-    case 0x166a:       /* (green steel) */
-      element = EL_STEEL_CHAR_2;
+    case 0x15f5:       /* (green) */
+      element = EL_CHAR_W;
       break;
 
-    case 0x166b:       /* (green steel) */
-      element = EL_STEEL_CHAR_3;
+    case 0x15f6:       /* (green) */
+      element = EL_CHAR_X;
       break;
 
-    case 0x166c:       /* (green steel) */
-      element = EL_STEEL_CHAR_4;
+    case 0x15f7:       /* (green) */
+      element = EL_CHAR_Y;
       break;
 
-    case 0x166d:       /* (green steel) */
-      element = EL_STEEL_CHAR_5;
+    case 0x15f8:       /* (green) */
+      element = EL_CHAR_Z;
       break;
 
-    case 0x166e:       /* (green steel) */
-      element = EL_STEEL_CHAR_6;
+    case 0x15f9:       /* (green) */
+      element = EL_CHAR_AUMLAUT;
       break;
 
-    case 0x166f:       /* (green steel) */
-      element = EL_STEEL_CHAR_7;
+    case 0x15fa:       /* (green) */
+      element = EL_CHAR_OUMLAUT;
       break;
 
-    case 0x1670:       /* (green steel) */
-      element = EL_STEEL_CHAR_8;
+    case 0x15fb:       /* (green) */
+      element = EL_CHAR_UUMLAUT;
       break;
 
-    case 0x1671:       /* (green steel) */
-      element = EL_STEEL_CHAR_9;
+    case 0x15fc:       /* (green) */
+      element = EL_CHAR_0;
       break;
 
-    case 0x1672:       /* (green steel) */
-      element = EL_STEEL_CHAR_PERIOD;
+    case 0x15fd:       /* (green) */
+      element = EL_CHAR_1;
       break;
 
-    case 0x1673:       /* (green steel) */
-      element = EL_STEEL_CHAR_EXCLAM;
+    case 0x15fe:       /* (green) */
+      element = EL_CHAR_2;
       break;
 
-    case 0x1674:       /* (green steel) */
-      element = EL_STEEL_CHAR_COLON;
+    case 0x15ff:       /* (green) */
+      element = EL_CHAR_3;
       break;
 
-    case 0x1675:       /* (green steel) */
-      element = EL_STEEL_CHAR_LESS;
+    case 0x1600:       /* (green) */
+      element = EL_CHAR_4;
       break;
 
-    case 0x1676:       /* (green steel) */
-      element = EL_STEEL_CHAR_GREATER;
+    case 0x1601:       /* (green) */
+      element = EL_CHAR_5;
       break;
 
-    case 0x1677:       /* (green steel) */
-      element = EL_STEEL_CHAR_QUESTION;
+    case 0x1602:       /* (green) */
+      element = EL_CHAR_6;
       break;
 
-    case 0x1678:       /* (green steel) */
-      element = EL_STEEL_CHAR_COPYRIGHT;
+    case 0x1603:       /* (green) */
+      element = EL_CHAR_7;
       break;
 
-    case 0x1679:       /* (green steel) */
-      element = EL_STEEL_CHAR_UP;
+    case 0x1604:       /* (green) */
+      element = EL_CHAR_8;
       break;
 
-    case 0x167a:       /* (green steel) */
-      element = EL_STEEL_CHAR_DOWN;
+    case 0x1605:       /* (green) */
+      element = EL_CHAR_9;
       break;
 
-    case 0x167b:       /* (green steel) */
-      element = EL_STEEL_CHAR_BUTTON;
+    case 0x1606:       /* (green) */
+      element = EL_CHAR_PERIOD;
       break;
 
-    case 0x167c:       /* (green steel) */
-      element = EL_STEEL_CHAR_PLUS;
+    case 0x1607:       /* (green) */
+      element = EL_CHAR_EXCLAM;
       break;
 
-    case 0x167d:       /* (green steel) */
-      element = EL_STEEL_CHAR_MINUS;
+    case 0x1608:       /* (green) */
+      element = EL_CHAR_COLON;
       break;
 
-    case 0x167e:       /* (green steel) */
-      element = EL_STEEL_CHAR_APOSTROPHE;
+    case 0x1609:       /* (green) */
+      element = EL_CHAR_LESS;
       break;
 
-    case 0x167f:       /* (green steel) */
-      element = EL_STEEL_CHAR_PARENLEFT;
+    case 0x160a:       /* (green) */
+      element = EL_CHAR_GREATER;
       break;
 
-    case 0x1680:       /* (green steel) */
-      element = EL_STEEL_CHAR_PARENRIGHT;
+    case 0x160b:       /* (green) */
+      element = EL_CHAR_QUESTION;
       break;
 
-    case 0x1681:       /* gate (red) */
-      element = EL_EM_GATE_1;
+    case 0x160c:       /* (green) */
+      element = EL_CHAR_COPYRIGHT;
       break;
 
-    case 0x1682:       /* secret gate (red) */
-      element = EL_GATE_1_GRAY;
+    case 0x160d:       /* (green) */
+      element = EL_CHAR_UP;
       break;
 
-    case 0x1683:       /* gate (yellow) */
-      element = EL_EM_GATE_2;
+    case 0x160e:       /* (green) */
+      element = EL_CHAR_DOWN;
       break;
 
-    case 0x1684:       /* secret gate (yellow) */
-      element = EL_GATE_2_GRAY;
+    case 0x160f:       /* (green) */
+      element = EL_CHAR_BUTTON;
       break;
 
-    case 0x1685:       /* gate (blue) */
-      element = EL_EM_GATE_4;
+    case 0x1610:       /* (green) */
+      element = EL_CHAR_PLUS;
       break;
 
-    case 0x1686:       /* secret gate (blue) */
-      element = EL_GATE_4_GRAY;
+    case 0x1611:       /* (green) */
+      element = EL_CHAR_MINUS;
       break;
 
-    case 0x1687:       /* gate (green) */
-      element = EL_EM_GATE_3;
+    case 0x1612:       /* (green) */
+      element = EL_CHAR_APOSTROPHE;
       break;
 
-    case 0x1688:       /* secret gate (green) */
-      element = EL_GATE_3_GRAY;
+    case 0x1613:       /* (green) */
+      element = EL_CHAR_PARENLEFT;
       break;
 
-    case 0x1689:       /* gate (white) */
-      element = EL_DC_GATE_WHITE;
+    case 0x1614:       /* (green) */
+      element = EL_CHAR_PARENRIGHT;
       break;
 
-    case 0x168a:       /* secret gate (white) */
-      element = EL_DC_GATE_WHITE_GRAY;
+    case 0x1615:       /* (blue steel) */
+      element = EL_STEEL_CHAR_A;
       break;
 
-    case 0x168b:       /* secret gate (no key) */
-      element = EL_DC_GATE_FAKE_GRAY;
+    case 0x1616:       /* (blue steel) */
+      element = EL_STEEL_CHAR_B;
       break;
 
-    case 0x168c:
-      element = EL_ROBOT_WHEEL;
+    case 0x1617:       /* (blue steel) */
+      element = EL_STEEL_CHAR_C;
       break;
 
-    case 0x168d:
-      element = EL_DC_TIMEGATE_SWITCH;
+    case 0x1618:       /* (blue steel) */
+      element = EL_STEEL_CHAR_D;
       break;
 
-    case 0x168e:
-      element = EL_ACID_POOL_BOTTOM;
+    case 0x1619:       /* (blue steel) */
+      element = EL_STEEL_CHAR_E;
       break;
 
-    case 0x168f:
-      element = EL_ACID_POOL_TOPLEFT;
+    case 0x161a:       /* (blue steel) */
+      element = EL_STEEL_CHAR_F;
       break;
 
-    case 0x1690:
-      element = EL_ACID_POOL_TOPRIGHT;
+    case 0x161b:       /* (blue steel) */
+      element = EL_STEEL_CHAR_G;
       break;
 
-    case 0x1691:
-      element = EL_ACID_POOL_BOTTOMLEFT;
+    case 0x161c:       /* (blue steel) */
+      element = EL_STEEL_CHAR_H;
       break;
 
-    case 0x1692:
-      element = EL_ACID_POOL_BOTTOMRIGHT;
+    case 0x161d:       /* (blue steel) */
+      element = EL_STEEL_CHAR_I;
       break;
 
-    case 0x1693:
-      element = EL_STEELWALL;
+    case 0x161e:       /* (blue steel) */
+      element = EL_STEEL_CHAR_J;
       break;
 
-    case 0x1694:
-      element = EL_STEELWALL_SLIPPERY;
+    case 0x161f:       /* (blue steel) */
+      element = EL_STEEL_CHAR_K;
       break;
 
-    case 0x1695:       /* steel wall (not round) */
-      element = EL_STEELWALL;
+    case 0x1620:       /* (blue steel) */
+      element = EL_STEEL_CHAR_L;
       break;
 
-    case 0x1696:       /* steel wall (left) */
-      element = EL_DC_STEELWALL_1_LEFT;
+    case 0x1621:       /* (blue steel) */
+      element = EL_STEEL_CHAR_M;
       break;
 
-    case 0x1697:       /* steel wall (bottom) */
-      element = EL_DC_STEELWALL_1_BOTTOM;
+    case 0x1622:       /* (blue steel) */
+      element = EL_STEEL_CHAR_N;
       break;
 
-    case 0x1698:       /* steel wall (right) */
-      element = EL_DC_STEELWALL_1_RIGHT;
+    case 0x1623:       /* (blue steel) */
+      element = EL_STEEL_CHAR_O;
       break;
 
-    case 0x1699:       /* steel wall (top) */
-      element = EL_DC_STEELWALL_1_TOP;
+    case 0x1624:       /* (blue steel) */
+      element = EL_STEEL_CHAR_P;
       break;
 
-    case 0x169a:       /* steel wall (left/bottom) */
-      element = EL_DC_STEELWALL_1_BOTTOMLEFT;
+    case 0x1625:       /* (blue steel) */
+      element = EL_STEEL_CHAR_Q;
       break;
 
-    case 0x169b:       /* steel wall (right/bottom) */
-      element = EL_DC_STEELWALL_1_BOTTOMRIGHT;
+    case 0x1626:       /* (blue steel) */
+      element = EL_STEEL_CHAR_R;
       break;
 
-    case 0x169c:       /* steel wall (right/top) */
-      element = EL_DC_STEELWALL_1_TOPRIGHT;
+    case 0x1627:       /* (blue steel) */
+      element = EL_STEEL_CHAR_S;
       break;
 
-    case 0x169d:       /* steel wall (left/top) */
-      element = EL_DC_STEELWALL_1_TOPLEFT;
+    case 0x1628:       /* (blue steel) */
+      element = EL_STEEL_CHAR_T;
       break;
 
-    case 0x169e:       /* steel wall (right/bottom small) */
-      element = EL_DC_STEELWALL_1_BOTTOMRIGHT_2;
+    case 0x1629:       /* (blue steel) */
+      element = EL_STEEL_CHAR_U;
       break;
 
-    case 0x169f:       /* steel wall (left/bottom small) */
-      element = EL_DC_STEELWALL_1_BOTTOMLEFT_2;
+    case 0x162a:       /* (blue steel) */
+      element = EL_STEEL_CHAR_V;
       break;
 
-    case 0x16a0:       /* steel wall (right/top small) */
-      element = EL_DC_STEELWALL_1_TOPRIGHT_2;
+    case 0x162b:       /* (blue steel) */
+      element = EL_STEEL_CHAR_W;
       break;
 
-    case 0x16a1:       /* steel wall (left/top small) */
-      element = EL_DC_STEELWALL_1_TOPLEFT_2;
+    case 0x162c:       /* (blue steel) */
+      element = EL_STEEL_CHAR_X;
       break;
 
-    case 0x16a2:       /* steel wall (left/right) */
-      element = EL_DC_STEELWALL_1_VERTICAL;
+    case 0x162d:       /* (blue steel) */
+      element = EL_STEEL_CHAR_Y;
       break;
 
-    case 0x16a3:       /* steel wall (top/bottom) */
-      element = EL_DC_STEELWALL_1_HORIZONTAL;
+    case 0x162e:       /* (blue steel) */
+      element = EL_STEEL_CHAR_Z;
       break;
 
-    case 0x16a4:       /* steel wall 2 (left end) */
-      element = EL_DC_STEELWALL_2_LEFT;
+    case 0x162f:       /* (blue steel) */
+      element = EL_STEEL_CHAR_AUMLAUT;
       break;
 
-    case 0x16a5:       /* steel wall 2 (right end) */
-      element = EL_DC_STEELWALL_2_RIGHT;
+    case 0x1630:       /* (blue steel) */
+      element = EL_STEEL_CHAR_OUMLAUT;
       break;
 
-    case 0x16a6:       /* steel wall 2 (top end) */
-      element = EL_DC_STEELWALL_2_TOP;
+    case 0x1631:       /* (blue steel) */
+      element = EL_STEEL_CHAR_UUMLAUT;
       break;
 
-    case 0x16a7:       /* steel wall 2 (bottom end) */
-      element = EL_DC_STEELWALL_2_BOTTOM;
+    case 0x1632:       /* (blue steel) */
+      element = EL_STEEL_CHAR_0;
       break;
 
-    case 0x16a8:       /* steel wall 2 (left/right) */
-      element = EL_DC_STEELWALL_2_HORIZONTAL;
+    case 0x1633:       /* (blue steel) */
+      element = EL_STEEL_CHAR_1;
       break;
 
-    case 0x16a9:       /* steel wall 2 (up/down) */
-      element = EL_DC_STEELWALL_2_VERTICAL;
+    case 0x1634:       /* (blue steel) */
+      element = EL_STEEL_CHAR_2;
       break;
 
-    case 0x16aa:       /* steel wall 2 (mid) */
-      element = EL_DC_STEELWALL_2_MIDDLE;
+    case 0x1635:       /* (blue steel) */
+      element = EL_STEEL_CHAR_3;
       break;
 
-    case 0x16ab:
-      element = EL_SIGN_EXCLAMATION;
+    case 0x1636:       /* (blue steel) */
+      element = EL_STEEL_CHAR_4;
       break;
 
-    case 0x16ac:
-      element = EL_SIGN_RADIOACTIVITY;
+    case 0x1637:       /* (blue steel) */
+      element = EL_STEEL_CHAR_5;
       break;
 
-    case 0x16ad:
-      element = EL_SIGN_STOP;
+    case 0x1638:       /* (blue steel) */
+      element = EL_STEEL_CHAR_6;
       break;
 
-    case 0x16ae:
-      element = EL_SIGN_WHEELCHAIR;
+    case 0x1639:       /* (blue steel) */
+      element = EL_STEEL_CHAR_7;
       break;
 
-    case 0x16af:
-      element = EL_SIGN_PARKING;
+    case 0x163a:       /* (blue steel) */
+      element = EL_STEEL_CHAR_8;
       break;
 
-    case 0x16b0:
-      element = EL_SIGN_NO_ENTRY;
+    case 0x163b:       /* (blue steel) */
+      element = EL_STEEL_CHAR_9;
       break;
 
-    case 0x16b1:
-      element = EL_SIGN_HEART;
+    case 0x163c:       /* (blue steel) */
+      element = EL_STEEL_CHAR_PERIOD;
       break;
 
-    case 0x16b2:
-      element = EL_SIGN_GIVE_WAY;
+    case 0x163d:       /* (blue steel) */
+      element = EL_STEEL_CHAR_EXCLAM;
       break;
 
-    case 0x16b3:
-      element = EL_SIGN_ENTRY_FORBIDDEN;
+    case 0x163e:       /* (blue steel) */
+      element = EL_STEEL_CHAR_COLON;
       break;
 
-    case 0x16b4:
-      element = EL_SIGN_EMERGENCY_EXIT;
+    case 0x163f:       /* (blue steel) */
+      element = EL_STEEL_CHAR_LESS;
       break;
 
-    case 0x16b5:
-      element = EL_SIGN_YIN_YANG;
+    case 0x1640:       /* (blue steel) */
+      element = EL_STEEL_CHAR_GREATER;
       break;
 
-    case 0x16b6:
-      element = EL_WALL_EMERALD;
+    case 0x1641:       /* (blue steel) */
+      element = EL_STEEL_CHAR_QUESTION;
       break;
 
-    case 0x16b7:
-      element = EL_WALL_DIAMOND;
+    case 0x1642:       /* (blue steel) */
+      element = EL_STEEL_CHAR_COPYRIGHT;
       break;
 
-    case 0x16b8:
-      element = EL_WALL_PEARL;
+    case 0x1643:       /* (blue steel) */
+      element = EL_STEEL_CHAR_UP;
       break;
 
-    case 0x16b9:
-      element = EL_WALL_CRYSTAL;
+    case 0x1644:       /* (blue steel) */
+      element = EL_STEEL_CHAR_DOWN;
       break;
 
-    case 0x16ba:
-      element = EL_INVISIBLE_WALL;
+    case 0x1645:       /* (blue steel) */
+      element = EL_STEEL_CHAR_BUTTON;
       break;
 
-    case 0x16bb:
-      element = EL_INVISIBLE_STEELWALL;
+    case 0x1646:       /* (blue steel) */
+      element = EL_STEEL_CHAR_PLUS;
       break;
 
-      /* 0x16bc - 0x16cb: */
-      /* EL_INVISIBLE_SAND */
-
-    case 0x16cc:
-      element = EL_LIGHT_SWITCH;
+    case 0x1647:       /* (blue steel) */
+      element = EL_STEEL_CHAR_MINUS;
       break;
 
-    case 0x16cd:
-      element = EL_ENVELOPE_1;
+    case 0x1648:       /* (blue steel) */
+      element = EL_STEEL_CHAR_APOSTROPHE;
       break;
 
-    default:
-      if (element >= 0x0117 && element <= 0x036e)      /* (?) */
-       element = EL_DIAMOND;
-      else if (element >= 0x042d && element <= 0x0684) /* (?) */
-       element = EL_EMERALD;
-      else if (element >= 0x157c && element <= 0x158b)
-       element = EL_SAND;
-      else if (element >= 0x1590 && element <= 0x159f)
-       element = EL_DC_LANDMINE;
-      else if (element >= 0x16bc && element <= 0x16cb)
-       element = EL_INVISIBLE_SAND;
-      else
-      {
-       Error(ERR_WARN, "unknown Diamond Caves element 0x%04x", element);
-       element = EL_UNKNOWN;
-      }
+    case 0x1649:       /* (blue steel) */
+      element = EL_STEEL_CHAR_PARENLEFT;
       break;
-  }
 
-  return getMappedElement(element);
-}
+    case 0x164a:       /* (blue steel) */
+      element = EL_STEEL_CHAR_PARENRIGHT;
+      break;
 
-#if 1
+    case 0x164b:       /* (green steel) */
+      element = EL_STEEL_CHAR_A;
+      break;
 
-#if 1
+    case 0x164c:       /* (green steel) */
+      element = EL_STEEL_CHAR_B;
+      break;
 
-static void LoadLevelFromFileStream_DC(File *file, struct LevelInfo *level,
-                                      int nr)
-{
-  byte header[DC_LEVEL_HEADER_SIZE];
-  int envelope_size;
-  int envelope_header_pos = 62;
-  int envelope_content_pos = 94;
-  int level_name_pos = 251;
-  int level_author_pos = 292;
-  int envelope_header_len;
-  int envelope_content_len;
-  int level_name_len;
-  int level_author_len;
-  int fieldx, fieldy;
-  int num_yamyam_contents;
-  int i, x, y;
+    case 0x164d:       /* (green steel) */
+      element = EL_STEEL_CHAR_C;
+      break;
 
-  getDecodedWord_DC(0, TRUE);          /* initialize DC2 decoding engine */
+    case 0x164e:       /* (green steel) */
+      element = EL_STEEL_CHAR_D;
+      break;
 
-  for (i = 0; i < DC_LEVEL_HEADER_SIZE / 2; i++)
-  {
-    unsigned short header_word = getDecodedWord_DC(getFile16BitBE(file), FALSE);
+    case 0x164f:       /* (green steel) */
+      element = EL_STEEL_CHAR_E;
+      break;
 
-    header[i * 2 + 0] = header_word >> 8;
-    header[i * 2 + 1] = header_word & 0xff;
-  }
+    case 0x1650:       /* (green steel) */
+      element = EL_STEEL_CHAR_F;
+      break;
 
-  /* read some values from level header to check level decoding integrity */
-  fieldx = header[6] | (header[7] << 8);
-  fieldy = header[8] | (header[9] << 8);
-  num_yamyam_contents = header[60] | (header[61] << 8);
+    case 0x1651:       /* (green steel) */
+      element = EL_STEEL_CHAR_G;
+      break;
 
-  /* do some simple sanity checks to ensure that level was correctly decoded */
-  if (fieldx < 1 || fieldx > 256 ||
-      fieldy < 1 || fieldy > 256 ||
-      num_yamyam_contents < 1 || num_yamyam_contents > 8)
-  {
-    level->no_valid_file = TRUE;
+    case 0x1652:       /* (green steel) */
+      element = EL_STEEL_CHAR_H;
+      break;
 
-    Error(ERR_WARN, "cannot decode level from stream -- using empty level");
+    case 0x1653:       /* (green steel) */
+      element = EL_STEEL_CHAR_I;
+      break;
 
-    return;
-  }
+    case 0x1654:       /* (green steel) */
+      element = EL_STEEL_CHAR_J;
+      break;
 
-  /* maximum envelope header size is 31 bytes */
-  envelope_header_len  = header[envelope_header_pos];
-  /* maximum envelope content size is 110 (156?) bytes */
-  envelope_content_len = header[envelope_content_pos];
+    case 0x1655:       /* (green steel) */
+      element = EL_STEEL_CHAR_K;
+      break;
 
-  /* maximum level title size is 40 bytes */
-  level_name_len       = MIN(header[level_name_pos],   MAX_LEVEL_NAME_LEN);
-  /* maximum level author size is 30 (51?) bytes */
-  level_author_len     = MIN(header[level_author_pos], MAX_LEVEL_AUTHOR_LEN);
+    case 0x1656:       /* (green steel) */
+      element = EL_STEEL_CHAR_L;
+      break;
 
-  envelope_size = 0;
+    case 0x1657:       /* (green steel) */
+      element = EL_STEEL_CHAR_M;
+      break;
 
-  for (i = 0; i < envelope_header_len; i++)
-    if (envelope_size < MAX_ENVELOPE_TEXT_LEN)
-      level->envelope[0].text[envelope_size++] =
-       header[envelope_header_pos + 1 + i];
+    case 0x1658:       /* (green steel) */
+      element = EL_STEEL_CHAR_N;
+      break;
 
-  if (envelope_header_len > 0 && envelope_content_len > 0)
-  {
-    if (envelope_size < MAX_ENVELOPE_TEXT_LEN)
-      level->envelope[0].text[envelope_size++] = '\n';
-    if (envelope_size < MAX_ENVELOPE_TEXT_LEN)
-      level->envelope[0].text[envelope_size++] = '\n';
-  }
+    case 0x1659:       /* (green steel) */
+      element = EL_STEEL_CHAR_O;
+      break;
 
-  for (i = 0; i < envelope_content_len; i++)
-    if (envelope_size < MAX_ENVELOPE_TEXT_LEN)
-      level->envelope[0].text[envelope_size++] =
-       header[envelope_content_pos + 1 + i];
+    case 0x165a:       /* (green steel) */
+      element = EL_STEEL_CHAR_P;
+      break;
 
-  level->envelope[0].text[envelope_size] = '\0';
+    case 0x165b:       /* (green steel) */
+      element = EL_STEEL_CHAR_Q;
+      break;
 
-  level->envelope[0].xsize = MAX_ENVELOPE_XSIZE;
-  level->envelope[0].ysize = 10;
-  level->envelope[0].autowrap = TRUE;
-  level->envelope[0].centered = TRUE;
+    case 0x165c:       /* (green steel) */
+      element = EL_STEEL_CHAR_R;
+      break;
 
-  for (i = 0; i < level_name_len; i++)
-    level->name[i] = header[level_name_pos + 1 + i];
-  level->name[level_name_len] = '\0';
+    case 0x165d:       /* (green steel) */
+      element = EL_STEEL_CHAR_S;
+      break;
 
-  for (i = 0; i < level_author_len; i++)
-    level->author[i] = header[level_author_pos + 1 + i];
-  level->author[level_author_len] = '\0';
+    case 0x165e:       /* (green steel) */
+      element = EL_STEEL_CHAR_T;
+      break;
 
-  num_yamyam_contents = header[60] | (header[61] << 8);
-  level->num_yamyam_contents =
-    MIN(MAX(MIN_ELEMENT_CONTENTS, num_yamyam_contents), MAX_ELEMENT_CONTENTS);
+    case 0x165f:       /* (green steel) */
+      element = EL_STEEL_CHAR_U;
+      break;
 
-  for (i = 0; i < num_yamyam_contents; i++)
-  {
-    for (y = 0; y < 3; y++) for (x = 0; x < 3; x++)
-    {
-      unsigned short word = getDecodedWord_DC(getFile16BitBE(file), FALSE);
-#if 1
-      int element_dc = ((word & 0xff) << 8) | ((word >> 8) & 0xff);
-#else
-      int element_dc = word;
-#endif
+    case 0x1660:       /* (green steel) */
+      element = EL_STEEL_CHAR_V;
+      break;
 
-      if (i < MAX_ELEMENT_CONTENTS)
-       level->yamyam_content[i].e[x][y] = getMappedElement_DC(element_dc);
-    }
-  }
+    case 0x1661:       /* (green steel) */
+      element = EL_STEEL_CHAR_W;
+      break;
 
-  fieldx = header[6] | (header[7] << 8);
-  fieldy = header[8] | (header[9] << 8);
-  level->fieldx = MIN(MAX(MIN_LEV_FIELDX, fieldx), MAX_LEV_FIELDX);
-  level->fieldy = MIN(MAX(MIN_LEV_FIELDY, fieldy), MAX_LEV_FIELDY);
+    case 0x1662:       /* (green steel) */
+      element = EL_STEEL_CHAR_X;
+      break;
 
-  for (y = 0; y < fieldy; y++) for (x = 0; x < fieldx; x++)
-  {
-    unsigned short word = getDecodedWord_DC(getFile16BitBE(file), FALSE);
-#if 1
-    int element_dc = ((word & 0xff) << 8) | ((word >> 8) & 0xff);
-#else
-    int element_dc = word;
-#endif
+    case 0x1663:       /* (green steel) */
+      element = EL_STEEL_CHAR_Y;
+      break;
 
-    if (x < MAX_LEV_FIELDX && y < MAX_LEV_FIELDY)
-      level->field[x][y] = getMappedElement_DC(element_dc);
-  }
+    case 0x1664:       /* (green steel) */
+      element = EL_STEEL_CHAR_Z;
+      break;
 
-  x = MIN(MAX(0, (header[10] | (header[11] << 8)) - 1), MAX_LEV_FIELDX - 1);
-  y = MIN(MAX(0, (header[12] | (header[13] << 8)) - 1), MAX_LEV_FIELDY - 1);
-  level->field[x][y] = EL_PLAYER_1;
+    case 0x1665:       /* (green steel) */
+      element = EL_STEEL_CHAR_AUMLAUT;
+      break;
 
-  x = MIN(MAX(0, (header[14] | (header[15] << 8)) - 1), MAX_LEV_FIELDX - 1);
-  y = MIN(MAX(0, (header[16] | (header[17] << 8)) - 1), MAX_LEV_FIELDY - 1);
-  level->field[x][y] = EL_PLAYER_2;
+    case 0x1666:       /* (green steel) */
+      element = EL_STEEL_CHAR_OUMLAUT;
+      break;
 
-  level->gems_needed           = header[18] | (header[19] << 8);
+    case 0x1667:       /* (green steel) */
+      element = EL_STEEL_CHAR_UUMLAUT;
+      break;
 
-  level->score[SC_EMERALD]     = header[20] | (header[21] << 8);
-  level->score[SC_DIAMOND]     = header[22] | (header[23] << 8);
-  level->score[SC_PEARL]       = header[24] | (header[25] << 8);
-  level->score[SC_CRYSTAL]     = header[26] | (header[27] << 8);
-  level->score[SC_NUT]         = header[28] | (header[29] << 8);
-  level->score[SC_ROBOT]       = header[30] | (header[31] << 8);
-  level->score[SC_SPACESHIP]   = header[32] | (header[33] << 8);
-  level->score[SC_BUG]         = header[34] | (header[35] << 8);
-  level->score[SC_YAMYAM]      = header[36] | (header[37] << 8);
-  level->score[SC_DYNAMITE]    = header[38] | (header[39] << 8);
-  level->score[SC_KEY]         = header[40] | (header[41] << 8);
-  level->score[SC_TIME_BONUS]  = header[42] | (header[43] << 8);
+    case 0x1668:       /* (green steel) */
+      element = EL_STEEL_CHAR_0;
+      break;
 
-  level->time                  = header[44] | (header[45] << 8);
+    case 0x1669:       /* (green steel) */
+      element = EL_STEEL_CHAR_1;
+      break;
 
-  level->amoeba_speed          = header[46] | (header[47] << 8);
-  level->time_light            = header[48] | (header[49] << 8);
-  level->time_timegate         = header[50] | (header[51] << 8);
-  level->time_wheel            = header[52] | (header[53] << 8);
-  level->time_magic_wall       = header[54] | (header[55] << 8);
-  level->extra_time            = header[56] | (header[57] << 8);
-  level->shield_normal_time    = header[58] | (header[59] << 8);
+    case 0x166a:       /* (green steel) */
+      element = EL_STEEL_CHAR_2;
+      break;
 
-  /* Diamond Caves has the same (strange) behaviour as Emerald Mine that gems
-     can slip down from flat walls, like normal walls and steel walls */
-  level->em_slippery_gems = TRUE;
+    case 0x166b:       /* (green steel) */
+      element = EL_STEEL_CHAR_3;
+      break;
 
-#if 0
-  /* Diamond Caves II levels are always surrounded by indestructible wall, but
-     not necessarily in a rectangular way -- fill with invisible steel wall */
+    case 0x166c:       /* (green steel) */
+      element = EL_STEEL_CHAR_4;
+      break;
 
-  /* !!! not always true !!! keep level and set BorderElement instead !!! */
+    case 0x166d:       /* (green steel) */
+      element = EL_STEEL_CHAR_5;
+      break;
 
-  for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
-  {
-#if 1
-    if ((x == 0 || x == level->fieldx - 1 ||
-        y == 0 || y == level->fieldy - 1) &&
-       level->field[x][y] == EL_EMPTY)
-      level->field[x][y] = EL_INVISIBLE_STEELWALL;
-#else
-    if ((x == 0 || x == level->fieldx - 1 ||
-        y == 0 || y == level->fieldy - 1) &&
-       level->field[x][y] == EL_EMPTY)
-      FloodFillLevel(x, y, EL_INVISIBLE_STEELWALL,
-                    level->field, level->fieldx, level->fieldy);
-#endif
-  }
-#endif
-}
+    case 0x166e:       /* (green steel) */
+      element = EL_STEEL_CHAR_6;
+      break;
 
-static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
-                                    struct LevelFileInfo *level_file_info,
-                                    boolean level_info_only)
-{
-  char *filename = level_file_info->filename;
-  File *file;
-  int num_magic_bytes = 8;
-  char magic_bytes[num_magic_bytes + 1];
-  int num_levels_to_skip = level_file_info->nr - leveldir_current->first_level;
+    case 0x166f:       /* (green steel) */
+      element = EL_STEEL_CHAR_7;
+      break;
 
-  if (!(file = openFile(filename, MODE_READ)))
-  {
-    level->no_valid_file = TRUE;
+    case 0x1670:       /* (green steel) */
+      element = EL_STEEL_CHAR_8;
+      break;
 
-    if (!level_info_only)
-      Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
+    case 0x1671:       /* (green steel) */
+      element = EL_STEEL_CHAR_9;
+      break;
 
-    return;
-  }
+    case 0x1672:       /* (green steel) */
+      element = EL_STEEL_CHAR_PERIOD;
+      break;
 
-  // fseek(file, 0x0000, SEEK_SET);
+    case 0x1673:       /* (green steel) */
+      element = EL_STEEL_CHAR_EXCLAM;
+      break;
 
-  if (level_file_info->packed)
-  {
-    /* read "magic bytes" from start of file */
-    if (getStringFromFile(file, magic_bytes, num_magic_bytes + 1) == NULL)
-      magic_bytes[0] = '\0';
+    case 0x1674:       /* (green steel) */
+      element = EL_STEEL_CHAR_COLON;
+      break;
 
-    /* check "magic bytes" for correct file format */
-    if (!strPrefix(magic_bytes, "DC2"))
-    {
-      level->no_valid_file = TRUE;
+    case 0x1675:       /* (green steel) */
+      element = EL_STEEL_CHAR_LESS;
+      break;
 
-      Error(ERR_WARN, "unknown DC level file '%s' -- using empty level",
-           filename);
+    case 0x1676:       /* (green steel) */
+      element = EL_STEEL_CHAR_GREATER;
+      break;
 
-      return;
-    }
+    case 0x1677:       /* (green steel) */
+      element = EL_STEEL_CHAR_QUESTION;
+      break;
 
-    if (strPrefix(magic_bytes, "DC2Win95") ||
-       strPrefix(magic_bytes, "DC2Win98"))
-    {
-      int position_first_level = 0x00fa;
-      int extra_bytes = 4;
-      int skip_bytes;
+    case 0x1678:       /* (green steel) */
+      element = EL_STEEL_CHAR_COPYRIGHT;
+      break;
 
-      /* advance file stream to first level inside the level package */
-      skip_bytes = position_first_level - num_magic_bytes - extra_bytes;
+    case 0x1679:       /* (green steel) */
+      element = EL_STEEL_CHAR_UP;
+      break;
 
-      /* each block of level data is followed by block of non-level data */
-      num_levels_to_skip *= 2;
+    case 0x167a:       /* (green steel) */
+      element = EL_STEEL_CHAR_DOWN;
+      break;
 
-      /* at least skip header bytes, therefore use ">= 0" instead of "> 0" */
-      while (num_levels_to_skip >= 0)
-      {
-       /* advance file stream to next level inside the level package */
-       if (seekFile(file, skip_bytes, SEEK_CUR) != 0)
-       {
-         level->no_valid_file = TRUE;
+    case 0x167b:       /* (green steel) */
+      element = EL_STEEL_CHAR_BUTTON;
+      break;
 
-         Error(ERR_WARN, "cannot fseek in file '%s' -- using empty level",
-               filename);
+    case 0x167c:       /* (green steel) */
+      element = EL_STEEL_CHAR_PLUS;
+      break;
 
-         return;
-       }
+    case 0x167d:       /* (green steel) */
+      element = EL_STEEL_CHAR_MINUS;
+      break;
 
-       /* skip apparently unused extra bytes following each level */
-       ReadUnusedBytesFromFile(file, extra_bytes);
+    case 0x167e:       /* (green steel) */
+      element = EL_STEEL_CHAR_APOSTROPHE;
+      break;
 
-       /* read size of next level in level package */
-       skip_bytes = getFile32BitLE(file);
+    case 0x167f:       /* (green steel) */
+      element = EL_STEEL_CHAR_PARENLEFT;
+      break;
 
-       num_levels_to_skip--;
-      }
-    }
-    else
-    {
-      level->no_valid_file = TRUE;
+    case 0x1680:       /* (green steel) */
+      element = EL_STEEL_CHAR_PARENRIGHT;
+      break;
 
-      Error(ERR_WARN, "unknown DC2 level file '%s' -- using empty level",
-           filename);
+    case 0x1681:       /* gate (red) */
+      element = EL_EM_GATE_1;
+      break;
 
-      return;
-    }
-  }
+    case 0x1682:       /* secret gate (red) */
+      element = EL_GATE_1_GRAY;
+      break;
 
-  LoadLevelFromFileStream_DC(file, level, level_file_info->nr);
+    case 0x1683:       /* gate (yellow) */
+      element = EL_EM_GATE_2;
+      break;
 
-  closeFile(file);
-}
+    case 0x1684:       /* secret gate (yellow) */
+      element = EL_GATE_2_GRAY;
+      break;
 
-#else
+    case 0x1685:       /* gate (blue) */
+      element = EL_EM_GATE_4;
+      break;
 
-static void LoadLevelFromFileStream_DC(FILE *file, struct LevelInfo *level,
-                                      int nr)
-{
-  byte header[DC_LEVEL_HEADER_SIZE];
-  int envelope_size;
-  int envelope_header_pos = 62;
-  int envelope_content_pos = 94;
-  int level_name_pos = 251;
-  int level_author_pos = 292;
-  int envelope_header_len;
-  int envelope_content_len;
-  int level_name_len;
-  int level_author_len;
-  int fieldx, fieldy;
-  int num_yamyam_contents;
-  int i, x, y;
+    case 0x1686:       /* secret gate (blue) */
+      element = EL_GATE_4_GRAY;
+      break;
 
-  getDecodedWord_DC(0, TRUE);          /* initialize DC2 decoding engine */
+    case 0x1687:       /* gate (green) */
+      element = EL_EM_GATE_3;
+      break;
 
-  for (i = 0; i < DC_LEVEL_HEADER_SIZE / 2; i++)
-  {
-    unsigned short header_word = getDecodedWord_DC(getFile16BitBE(file), FALSE);
+    case 0x1688:       /* secret gate (green) */
+      element = EL_GATE_3_GRAY;
+      break;
 
-    header[i * 2 + 0] = header_word >> 8;
-    header[i * 2 + 1] = header_word & 0xff;
-  }
+    case 0x1689:       /* gate (white) */
+      element = EL_DC_GATE_WHITE;
+      break;
 
-  /* read some values from level header to check level decoding integrity */
-  fieldx = header[6] | (header[7] << 8);
-  fieldy = header[8] | (header[9] << 8);
-  num_yamyam_contents = header[60] | (header[61] << 8);
+    case 0x168a:       /* secret gate (white) */
+      element = EL_DC_GATE_WHITE_GRAY;
+      break;
 
-  /* do some simple sanity checks to ensure that level was correctly decoded */
-  if (fieldx < 1 || fieldx > 256 ||
-      fieldy < 1 || fieldy > 256 ||
-      num_yamyam_contents < 1 || num_yamyam_contents > 8)
-  {
-    level->no_valid_file = TRUE;
+    case 0x168b:       /* secret gate (no key) */
+      element = EL_DC_GATE_FAKE_GRAY;
+      break;
 
-    Error(ERR_WARN, "cannot decode level from stream -- using empty level");
+    case 0x168c:
+      element = EL_ROBOT_WHEEL;
+      break;
 
-    return;
-  }
+    case 0x168d:
+      element = EL_DC_TIMEGATE_SWITCH;
+      break;
 
-  /* maximum envelope header size is 31 bytes */
-  envelope_header_len  = header[envelope_header_pos];
-  /* maximum envelope content size is 110 (156?) bytes */
-  envelope_content_len = header[envelope_content_pos];
+    case 0x168e:
+      element = EL_ACID_POOL_BOTTOM;
+      break;
 
-  /* maximum level title size is 40 bytes */
-  level_name_len       = MIN(header[level_name_pos],   MAX_LEVEL_NAME_LEN);
-  /* maximum level author size is 30 (51?) bytes */
-  level_author_len     = MIN(header[level_author_pos], MAX_LEVEL_AUTHOR_LEN);
+    case 0x168f:
+      element = EL_ACID_POOL_TOPLEFT;
+      break;
 
-  envelope_size = 0;
+    case 0x1690:
+      element = EL_ACID_POOL_TOPRIGHT;
+      break;
 
-  for (i = 0; i < envelope_header_len; i++)
-    if (envelope_size < MAX_ENVELOPE_TEXT_LEN)
-      level->envelope[0].text[envelope_size++] =
-       header[envelope_header_pos + 1 + i];
+    case 0x1691:
+      element = EL_ACID_POOL_BOTTOMLEFT;
+      break;
 
-  if (envelope_header_len > 0 && envelope_content_len > 0)
-  {
-    if (envelope_size < MAX_ENVELOPE_TEXT_LEN)
-      level->envelope[0].text[envelope_size++] = '\n';
-    if (envelope_size < MAX_ENVELOPE_TEXT_LEN)
-      level->envelope[0].text[envelope_size++] = '\n';
-  }
+    case 0x1692:
+      element = EL_ACID_POOL_BOTTOMRIGHT;
+      break;
 
-  for (i = 0; i < envelope_content_len; i++)
-    if (envelope_size < MAX_ENVELOPE_TEXT_LEN)
-      level->envelope[0].text[envelope_size++] =
-       header[envelope_content_pos + 1 + i];
+    case 0x1693:
+      element = EL_STEELWALL;
+      break;
 
-  level->envelope[0].text[envelope_size] = '\0';
+    case 0x1694:
+      element = EL_STEELWALL_SLIPPERY;
+      break;
 
-  level->envelope[0].xsize = MAX_ENVELOPE_XSIZE;
-  level->envelope[0].ysize = 10;
-  level->envelope[0].autowrap = TRUE;
-  level->envelope[0].centered = TRUE;
+    case 0x1695:       /* steel wall (not round) */
+      element = EL_STEELWALL;
+      break;
 
-  for (i = 0; i < level_name_len; i++)
-    level->name[i] = header[level_name_pos + 1 + i];
-  level->name[level_name_len] = '\0';
+    case 0x1696:       /* steel wall (left) */
+      element = EL_DC_STEELWALL_1_LEFT;
+      break;
 
-  for (i = 0; i < level_author_len; i++)
-    level->author[i] = header[level_author_pos + 1 + i];
-  level->author[level_author_len] = '\0';
+    case 0x1697:       /* steel wall (bottom) */
+      element = EL_DC_STEELWALL_1_BOTTOM;
+      break;
 
-  num_yamyam_contents = header[60] | (header[61] << 8);
-  level->num_yamyam_contents =
-    MIN(MAX(MIN_ELEMENT_CONTENTS, num_yamyam_contents), MAX_ELEMENT_CONTENTS);
+    case 0x1698:       /* steel wall (right) */
+      element = EL_DC_STEELWALL_1_RIGHT;
+      break;
 
-  for (i = 0; i < num_yamyam_contents; i++)
-  {
-    for (y = 0; y < 3; y++) for (x = 0; x < 3; x++)
-    {
-      unsigned short word = getDecodedWord_DC(getFile16BitBE(file), FALSE);
-#if 1
-      int element_dc = ((word & 0xff) << 8) | ((word >> 8) & 0xff);
-#else
-      int element_dc = word;
-#endif
+    case 0x1699:       /* steel wall (top) */
+      element = EL_DC_STEELWALL_1_TOP;
+      break;
 
-      if (i < MAX_ELEMENT_CONTENTS)
-       level->yamyam_content[i].e[x][y] = getMappedElement_DC(element_dc);
-    }
-  }
+    case 0x169a:       /* steel wall (left/bottom) */
+      element = EL_DC_STEELWALL_1_BOTTOMLEFT;
+      break;
 
-  fieldx = header[6] | (header[7] << 8);
-  fieldy = header[8] | (header[9] << 8);
-  level->fieldx = MIN(MAX(MIN_LEV_FIELDX, fieldx), MAX_LEV_FIELDX);
-  level->fieldy = MIN(MAX(MIN_LEV_FIELDY, fieldy), MAX_LEV_FIELDY);
+    case 0x169b:       /* steel wall (right/bottom) */
+      element = EL_DC_STEELWALL_1_BOTTOMRIGHT;
+      break;
 
-  for (y = 0; y < fieldy; y++) for (x = 0; x < fieldx; x++)
-  {
-    unsigned short word = getDecodedWord_DC(getFile16BitBE(file), FALSE);
-#if 1
-    int element_dc = ((word & 0xff) << 8) | ((word >> 8) & 0xff);
-#else
-    int element_dc = word;
-#endif
+    case 0x169c:       /* steel wall (right/top) */
+      element = EL_DC_STEELWALL_1_TOPRIGHT;
+      break;
 
-    if (x < MAX_LEV_FIELDX && y < MAX_LEV_FIELDY)
-      level->field[x][y] = getMappedElement_DC(element_dc);
-  }
+    case 0x169d:       /* steel wall (left/top) */
+      element = EL_DC_STEELWALL_1_TOPLEFT;
+      break;
 
-  x = MIN(MAX(0, (header[10] | (header[11] << 8)) - 1), MAX_LEV_FIELDX - 1);
-  y = MIN(MAX(0, (header[12] | (header[13] << 8)) - 1), MAX_LEV_FIELDY - 1);
-  level->field[x][y] = EL_PLAYER_1;
+    case 0x169e:       /* steel wall (right/bottom small) */
+      element = EL_DC_STEELWALL_1_BOTTOMRIGHT_2;
+      break;
 
-  x = MIN(MAX(0, (header[14] | (header[15] << 8)) - 1), MAX_LEV_FIELDX - 1);
-  y = MIN(MAX(0, (header[16] | (header[17] << 8)) - 1), MAX_LEV_FIELDY - 1);
-  level->field[x][y] = EL_PLAYER_2;
+    case 0x169f:       /* steel wall (left/bottom small) */
+      element = EL_DC_STEELWALL_1_BOTTOMLEFT_2;
+      break;
 
-  level->gems_needed           = header[18] | (header[19] << 8);
+    case 0x16a0:       /* steel wall (right/top small) */
+      element = EL_DC_STEELWALL_1_TOPRIGHT_2;
+      break;
 
-  level->score[SC_EMERALD]     = header[20] | (header[21] << 8);
-  level->score[SC_DIAMOND]     = header[22] | (header[23] << 8);
-  level->score[SC_PEARL]       = header[24] | (header[25] << 8);
-  level->score[SC_CRYSTAL]     = header[26] | (header[27] << 8);
-  level->score[SC_NUT]         = header[28] | (header[29] << 8);
-  level->score[SC_ROBOT]       = header[30] | (header[31] << 8);
-  level->score[SC_SPACESHIP]   = header[32] | (header[33] << 8);
-  level->score[SC_BUG]         = header[34] | (header[35] << 8);
-  level->score[SC_YAMYAM]      = header[36] | (header[37] << 8);
-  level->score[SC_DYNAMITE]    = header[38] | (header[39] << 8);
-  level->score[SC_KEY]         = header[40] | (header[41] << 8);
-  level->score[SC_TIME_BONUS]  = header[42] | (header[43] << 8);
+    case 0x16a1:       /* steel wall (left/top small) */
+      element = EL_DC_STEELWALL_1_TOPLEFT_2;
+      break;
 
-  level->time                  = header[44] | (header[45] << 8);
+    case 0x16a2:       /* steel wall (left/right) */
+      element = EL_DC_STEELWALL_1_VERTICAL;
+      break;
 
-  level->amoeba_speed          = header[46] | (header[47] << 8);
-  level->time_light            = header[48] | (header[49] << 8);
-  level->time_timegate         = header[50] | (header[51] << 8);
-  level->time_wheel            = header[52] | (header[53] << 8);
-  level->time_magic_wall       = header[54] | (header[55] << 8);
-  level->extra_time            = header[56] | (header[57] << 8);
-  level->shield_normal_time    = header[58] | (header[59] << 8);
+    case 0x16a3:       /* steel wall (top/bottom) */
+      element = EL_DC_STEELWALL_1_HORIZONTAL;
+      break;
 
-  /* Diamond Caves has the same (strange) behaviour as Emerald Mine that gems
-     can slip down from flat walls, like normal walls and steel walls */
-  level->em_slippery_gems = TRUE;
+    case 0x16a4:       /* steel wall 2 (left end) */
+      element = EL_DC_STEELWALL_2_LEFT;
+      break;
 
-#if 0
-  /* Diamond Caves II levels are always surrounded by indestructible wall, but
-     not necessarily in a rectangular way -- fill with invisible steel wall */
+    case 0x16a5:       /* steel wall 2 (right end) */
+      element = EL_DC_STEELWALL_2_RIGHT;
+      break;
 
-  /* !!! not always true !!! keep level and set BorderElement instead !!! */
+    case 0x16a6:       /* steel wall 2 (top end) */
+      element = EL_DC_STEELWALL_2_TOP;
+      break;
 
-  for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
-  {
-#if 1
-    if ((x == 0 || x == level->fieldx - 1 ||
-        y == 0 || y == level->fieldy - 1) &&
-       level->field[x][y] == EL_EMPTY)
-      level->field[x][y] = EL_INVISIBLE_STEELWALL;
-#else
-    if ((x == 0 || x == level->fieldx - 1 ||
-        y == 0 || y == level->fieldy - 1) &&
-       level->field[x][y] == EL_EMPTY)
-      FloodFillLevel(x, y, EL_INVISIBLE_STEELWALL,
-                    level->field, level->fieldx, level->fieldy);
-#endif
-  }
-#endif
-}
+    case 0x16a7:       /* steel wall 2 (bottom end) */
+      element = EL_DC_STEELWALL_2_BOTTOM;
+      break;
 
-static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
-                                    struct LevelFileInfo *level_file_info,
-                                    boolean level_info_only)
-{
-  char *filename = level_file_info->filename;
-  FILE *file;
-  int num_magic_bytes = 8;
-  char magic_bytes[num_magic_bytes + 1];
-  int num_levels_to_skip = level_file_info->nr - leveldir_current->first_level;
+    case 0x16a8:       /* steel wall 2 (left/right) */
+      element = EL_DC_STEELWALL_2_HORIZONTAL;
+      break;
 
-  if (!(file = fopen(filename, MODE_READ)))
-  {
-    level->no_valid_file = TRUE;
+    case 0x16a9:       /* steel wall 2 (up/down) */
+      element = EL_DC_STEELWALL_2_VERTICAL;
+      break;
 
-    if (!level_info_only)
-      Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
+    case 0x16aa:       /* steel wall 2 (mid) */
+      element = EL_DC_STEELWALL_2_MIDDLE;
+      break;
 
-    return;
-  }
+    case 0x16ab:
+      element = EL_SIGN_EXCLAMATION;
+      break;
 
-  // fseek(file, 0x0000, SEEK_SET);
+    case 0x16ac:
+      element = EL_SIGN_RADIOACTIVITY;
+      break;
 
-  if (level_file_info->packed)
-  {
-    /* read "magic bytes" from start of file */
-    if (fgets(magic_bytes, num_magic_bytes + 1, file) == NULL)
-      magic_bytes[0] = '\0';
+    case 0x16ad:
+      element = EL_SIGN_STOP;
+      break;
 
-    /* check "magic bytes" for correct file format */
-    if (!strPrefix(magic_bytes, "DC2"))
-    {
-      level->no_valid_file = TRUE;
+    case 0x16ae:
+      element = EL_SIGN_WHEELCHAIR;
+      break;
 
-      Error(ERR_WARN, "unknown DC level file '%s' -- using empty level",
-           filename);
+    case 0x16af:
+      element = EL_SIGN_PARKING;
+      break;
 
-      return;
-    }
+    case 0x16b0:
+      element = EL_SIGN_NO_ENTRY;
+      break;
 
-    if (strPrefix(magic_bytes, "DC2Win95") ||
-       strPrefix(magic_bytes, "DC2Win98"))
-    {
-      int position_first_level = 0x00fa;
-      int extra_bytes = 4;
-      int skip_bytes;
+    case 0x16b1:
+      element = EL_SIGN_HEART;
+      break;
 
-      /* advance file stream to first level inside the level package */
-      skip_bytes = position_first_level - num_magic_bytes - extra_bytes;
+    case 0x16b2:
+      element = EL_SIGN_GIVE_WAY;
+      break;
 
-      /* each block of level data is followed by block of non-level data */
-      num_levels_to_skip *= 2;
+    case 0x16b3:
+      element = EL_SIGN_ENTRY_FORBIDDEN;
+      break;
 
-      /* at least skip header bytes, therefore use ">= 0" instead of "> 0" */
-      while (num_levels_to_skip >= 0)
-      {
-       /* advance file stream to next level inside the level package */
-       if (fseek(file, skip_bytes, SEEK_CUR) != 0)
-       {
-         level->no_valid_file = TRUE;
+    case 0x16b4:
+      element = EL_SIGN_EMERGENCY_EXIT;
+      break;
 
-         Error(ERR_WARN, "cannot fseek in file '%s' -- using empty level",
-               filename);
+    case 0x16b5:
+      element = EL_SIGN_YIN_YANG;
+      break;
 
-         return;
-       }
+    case 0x16b6:
+      element = EL_WALL_EMERALD;
+      break;
 
-       /* skip apparently unused extra bytes following each level */
-       ReadUnusedBytesFromFile(file, extra_bytes);
+    case 0x16b7:
+      element = EL_WALL_DIAMOND;
+      break;
 
-       /* read size of next level in level package */
-       skip_bytes = getFile32BitLE(file);
+    case 0x16b8:
+      element = EL_WALL_PEARL;
+      break;
 
-       num_levels_to_skip--;
-      }
-    }
-    else
-    {
-      level->no_valid_file = TRUE;
+    case 0x16b9:
+      element = EL_WALL_CRYSTAL;
+      break;
 
-      Error(ERR_WARN, "unknown DC2 level file '%s' -- using empty level",
-           filename);
+    case 0x16ba:
+      element = EL_INVISIBLE_WALL;
+      break;
 
-      return;
-    }
-  }
+    case 0x16bb:
+      element = EL_INVISIBLE_STEELWALL;
+      break;
 
-  LoadLevelFromFileStream_DC(file, level, level_file_info->nr);
+      /* 0x16bc - 0x16cb: */
+      /* EL_INVISIBLE_SAND */
 
-  fclose(file);
-}
+    case 0x16cc:
+      element = EL_LIGHT_SWITCH;
+      break;
 
-#endif
+    case 0x16cd:
+      element = EL_ENVELOPE_1;
+      break;
 
-#else
+    default:
+      if (element >= 0x0117 && element <= 0x036e)      /* (?) */
+       element = EL_DIAMOND;
+      else if (element >= 0x042d && element <= 0x0684) /* (?) */
+       element = EL_EMERALD;
+      else if (element >= 0x157c && element <= 0x158b)
+       element = EL_SAND;
+      else if (element >= 0x1590 && element <= 0x159f)
+       element = EL_DC_LANDMINE;
+      else if (element >= 0x16bc && element <= 0x16cb)
+       element = EL_INVISIBLE_SAND;
+      else
+      {
+       Error(ERR_WARN, "unknown Diamond Caves element 0x%04x", element);
+       element = EL_UNKNOWN;
+      }
+      break;
+  }
+
+  return getMappedElement(element);
+}
 
-static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
-                                    struct LevelFileInfo *level_file_info)
+static void LoadLevelFromFileStream_DC(File *file, struct LevelInfo *level,
+                                      int nr)
 {
-  char *filename = level_file_info->filename;
-  FILE *file;
-#if 0
-  int nr = level_file_info->nr - leveldir_current->first_level;
-#endif
   byte header[DC_LEVEL_HEADER_SIZE];
   int envelope_size;
   int envelope_header_pos = 62;
@@ -7919,28 +5568,6 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
   int num_yamyam_contents;
   int i, x, y;
 
-  if (!(file = fopen(filename, MODE_READ)))
-  {
-    level->no_valid_file = TRUE;
-
-    if (!level_info_only)
-      Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
-
-    return;
-  }
-
-#if 0
-  /* position file stream to the requested level inside the level package */
-  if (fseek(file, nr * SP_LEVEL_SIZE, SEEK_SET) != 0)
-  {
-    level->no_valid_file = TRUE;
-
-    Error(ERR_WARN, "cannot fseek in file '%s' -- using empty level", filename);
-
-    return;
-  }
-#endif
-
   getDecodedWord_DC(0, TRUE);          /* initialize DC2 decoding engine */
 
   for (i = 0; i < DC_LEVEL_HEADER_SIZE / 2; i++)
@@ -7963,8 +5590,7 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
   {
     level->no_valid_file = TRUE;
 
-    Error(ERR_WARN, "cannot read level from file '%s' -- using empty level",
-         filename);
+    Error(ERR_WARN, "cannot decode level from stream -- using empty level");
 
     return;
   }
@@ -8023,11 +5649,7 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
     for (y = 0; y < 3; y++) for (x = 0; x < 3; x++)
     {
       unsigned short word = getDecodedWord_DC(getFile16BitBE(file), FALSE);
-#if 1
       int element_dc = ((word & 0xff) << 8) | ((word >> 8) & 0xff);
-#else
-      int element_dc = word;
-#endif
 
       if (i < MAX_ELEMENT_CONTENTS)
        level->yamyam_content[i].e[x][y] = getMappedElement_DC(element_dc);
@@ -8042,11 +5664,7 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
   for (y = 0; y < fieldy; y++) for (x = 0; x < fieldx; x++)
   {
     unsigned short word = getDecodedWord_DC(getFile16BitBE(file), FALSE);
-#if 1
     int element_dc = ((word & 0xff) << 8) | ((word >> 8) & 0xff);
-#else
-    int element_dc = word;
-#endif
 
     if (x < MAX_LEV_FIELDX && y < MAX_LEV_FIELDY)
       level->field[x][y] = getMappedElement_DC(element_dc);
@@ -8085,386 +5703,138 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
   level->extra_time            = header[56] | (header[57] << 8);
   level->shield_normal_time    = header[58] | (header[59] << 8);
 
-  fclose(file);
-
   /* Diamond Caves has the same (strange) behaviour as Emerald Mine that gems
      can slip down from flat walls, like normal walls and steel walls */
   level->em_slippery_gems = TRUE;
-
-#if 0
-  /* Diamond Caves II levels are always surrounded by indestructible wall, but
-     not necessarily in a rectangular way -- fill with invisible steel wall */
-
-  /* !!! not always true !!! keep level and set BorderElement instead !!! */
-
-  for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
-  {
-#if 1
-    if ((x == 0 || x == level->fieldx - 1 ||
-        y == 0 || y == level->fieldy - 1) &&
-       level->field[x][y] == EL_EMPTY)
-      level->field[x][y] = EL_INVISIBLE_STEELWALL;
-#else
-    if ((x == 0 || x == level->fieldx - 1 ||
-        y == 0 || y == level->fieldy - 1) &&
-       level->field[x][y] == EL_EMPTY)
-      FloodFillLevel(x, y, EL_INVISIBLE_STEELWALL,
-                    level->field, level->fieldx, level->fieldy);
-#endif
-  }
-#endif
-}
-
-#endif
-
-
-/* ------------------------------------------------------------------------- */
-/* functions for loading SB level                                            */
-/* ------------------------------------------------------------------------- */
-
-int getMappedElement_SB(int element_ascii, boolean use_ces)
-{
-  static struct
-  {
-    int ascii;
-    int sb;
-    int ce;
-  }
-  sb_element_mapping[] =
-  {
-    { ' ', EL_EMPTY,                EL_CUSTOM_1 },  /* floor (space) */
-    { '#', EL_STEELWALL,            EL_CUSTOM_2 },  /* wall */
-    { '@', EL_PLAYER_1,             EL_CUSTOM_3 },  /* player */
-    { '$', EL_SOKOBAN_OBJECT,       EL_CUSTOM_4 },  /* box */
-    { '.', EL_SOKOBAN_FIELD_EMPTY,  EL_CUSTOM_5 },  /* goal square */
-    { '*', EL_SOKOBAN_FIELD_FULL,   EL_CUSTOM_6 },  /* box on goal square */
-    { '+', EL_SOKOBAN_FIELD_PLAYER, EL_CUSTOM_7 },  /* player on goal square */
-#if 0
-    { '_', EL_INVISIBLE_STEELWALL,  EL_CUSTOM_8 },  /* floor beyond border */
-#else
-    { '_', EL_INVISIBLE_STEELWALL,  EL_FROM_LEVEL_TEMPLATE },  /* floor beyond border */
-#endif
-
-    { 0,   -1,                      -1          },
-  };
-
-  int i;
-
-  for (i = 0; sb_element_mapping[i].ascii != 0; i++)
-    if (element_ascii == sb_element_mapping[i].ascii)
-      return (use_ces ? sb_element_mapping[i].ce : sb_element_mapping[i].sb);
-
-  return EL_UNDEFINED;
 }
 
-#if 1
-
-static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
+static void LoadLevelFromFileInfo_DC(struct LevelInfo *level,
                                     struct LevelFileInfo *level_file_info,
                                     boolean level_info_only)
 {
   char *filename = level_file_info->filename;
-  char line[MAX_LINE_LEN], line_raw[MAX_LINE_LEN], previous_line[MAX_LINE_LEN];
-  char last_comment[MAX_LINE_LEN];
-  char level_name[MAX_LINE_LEN];
-  char *line_ptr;
   File *file;
+  int num_magic_bytes = 8;
+  char magic_bytes[num_magic_bytes + 1];
   int num_levels_to_skip = level_file_info->nr - leveldir_current->first_level;
-  boolean read_continued_line = FALSE;
-  boolean reading_playfield = FALSE;
-  boolean got_valid_playfield_line = FALSE;
-  boolean invalid_playfield_char = FALSE;
-  boolean load_xsb_to_ces = check_special_flags("load_xsb_to_ces");
-  int file_level_nr = 0;
-  int line_nr = 0;
-  int x = 0, y = 0;            /* initialized to make compilers happy */
-
-#if 0
-  printf("::: looking for level number %d [%d]\n",
-        level_file_info->nr, num_levels_to_skip);
-#endif
-
-  last_comment[0] = '\0';
-  level_name[0] = '\0';
 
   if (!(file = openFile(filename, MODE_READ)))
   {
     level->no_valid_file = TRUE;
 
-    if (!level_info_only)
-      Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
-
-    return;
-  }
-
-  while (!checkEndOfFile(file))
-  {
-    /* level successfully read, but next level may follow here */
-    if (!got_valid_playfield_line && reading_playfield)
-    {
-#if 0
-      printf("::: read complete playfield\n");
-#endif
-
-      /* read playfield from single level file -- skip remaining file */
-      if (!level_file_info->packed)
-       break;
-
-      if (file_level_nr >= num_levels_to_skip)
-       break;
-
-      file_level_nr++;
-
-      last_comment[0] = '\0';
-      level_name[0] = '\0';
-
-      reading_playfield = FALSE;
-    }
-
-    got_valid_playfield_line = FALSE;
-
-    /* read next line of input file */
-    if (!getStringFromFile(file, line, MAX_LINE_LEN))
-      break;
-
-    /* check if line was completely read and is terminated by line break */
-    if (strlen(line) > 0 && line[strlen(line) - 1] == '\n')
-      line_nr++;
-
-    /* cut trailing line break (this can be newline and/or carriage return) */
-    for (line_ptr = &line[strlen(line)]; line_ptr >= line; line_ptr--)
-      if ((*line_ptr == '\n' || *line_ptr == '\r') && *(line_ptr + 1) == '\0')
-        *line_ptr = '\0';
-
-    /* copy raw input line for later use (mainly debugging output) */
-    strcpy(line_raw, line);
-
-    if (read_continued_line)
-    {
-      /* append new line to existing line, if there is enough space */
-      if (strlen(previous_line) + strlen(line_ptr) < MAX_LINE_LEN)
-        strcat(previous_line, line_ptr);
-
-      strcpy(line, previous_line);      /* copy storage buffer to line */
-
-      read_continued_line = FALSE;
-    }
-
-    /* if the last character is '\', continue at next line */
-    if (strlen(line) > 0 && line[strlen(line) - 1] == '\\')
-    {
-      line[strlen(line) - 1] = '\0';    /* cut off trailing backslash */
-      strcpy(previous_line, line);      /* copy line to storage buffer */
-
-      read_continued_line = TRUE;
-
-      continue;
-    }
-
-    /* skip empty lines */
-    if (line[0] == '\0')
-      continue;
-
-    /* extract comment text from comment line */
-    if (line[0] == ';')
-    {
-      for (line_ptr = line; *line_ptr; line_ptr++)
-        if (*line_ptr != ' ' && *line_ptr != '\t' && *line_ptr != ';')
-          break;
-
-      strcpy(last_comment, line_ptr);
-
-#if 0
-      printf("::: found comment '%s' in line %d\n", last_comment, line_nr);
-#endif
-
-      continue;
-    }
-
-    /* extract level title text from line containing level title */
-    if (line[0] == '\'')
-    {
-      strcpy(level_name, &line[1]);
-
-      if (strlen(level_name) > 0 && level_name[strlen(level_name) - 1] == '\'')
-       level_name[strlen(level_name) - 1] = '\0';
-
-#if 0
-      printf("::: found level name '%s' in line %d\n", level_name, line_nr);
-#endif
-
-      continue;
-    }
-
-    /* skip lines containing only spaces (or empty lines) */
-    for (line_ptr = line; *line_ptr; line_ptr++)
-      if (*line_ptr != ' ')
-       break;
-    if (*line_ptr == '\0')
-      continue;
-
-    /* at this point, we have found a line containing part of a playfield */
-
-#if 0
-    printf("::: found playfield row in line %d\n", line_nr);
-#endif
-
-    got_valid_playfield_line = TRUE;
-
-    if (!reading_playfield)
-    {
-      reading_playfield = TRUE;
-      invalid_playfield_char = FALSE;
-
-      for (x = 0; x < MAX_LEV_FIELDX; x++)
-       for (y = 0; y < MAX_LEV_FIELDY; y++)
-         level->field[x][y] = getMappedElement_SB(' ', load_xsb_to_ces);
-
-      level->fieldx = 0;
-      level->fieldy = 0;
-
-      /* start with topmost tile row */
-      y = 0;
-    }
-
-    /* skip playfield line if larger row than allowed */
-    if (y >= MAX_LEV_FIELDY)
-      continue;
-
-    /* start with leftmost tile column */
-    x = 0;
-
-    /* read playfield elements from line */
-    for (line_ptr = line; *line_ptr; line_ptr++)
-    {
-      int mapped_sb_element = getMappedElement_SB(*line_ptr, load_xsb_to_ces);
+    if (!level_info_only)
+      Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
 
-      /* stop parsing playfield line if larger column than allowed */
-      if (x >= MAX_LEV_FIELDX)
-       break;
+    return;
+  }
 
-      if (mapped_sb_element == EL_UNDEFINED)
-      {
-       invalid_playfield_char = TRUE;
+  // fseek(file, 0x0000, SEEK_SET);
 
-       break;
-      }
+  if (level_file_info->packed)
+  {
+    /* read "magic bytes" from start of file */
+    if (getStringFromFile(file, magic_bytes, num_magic_bytes + 1) == NULL)
+      magic_bytes[0] = '\0';
 
-      level->field[x][y] = mapped_sb_element;
+    /* check "magic bytes" for correct file format */
+    if (!strPrefix(magic_bytes, "DC2"))
+    {
+      level->no_valid_file = TRUE;
 
-      /* continue with next tile column */
-      x++;
+      Error(ERR_WARN, "unknown DC level file '%s' -- using empty level",
+           filename);
 
-      level->fieldx = MAX(x, level->fieldx);
+      return;
     }
 
-    if (invalid_playfield_char)
+    if (strPrefix(magic_bytes, "DC2Win95") ||
+       strPrefix(magic_bytes, "DC2Win98"))
     {
-      /* if first playfield line, treat invalid lines as comment lines */
-      if (y == 0)
-       reading_playfield = FALSE;
+      int position_first_level = 0x00fa;
+      int extra_bytes = 4;
+      int skip_bytes;
 
-      continue;
-    }
+      /* advance file stream to first level inside the level package */
+      skip_bytes = position_first_level - num_magic_bytes - extra_bytes;
 
-    /* continue with next tile row */
-    y++;
-  }
+      /* each block of level data is followed by block of non-level data */
+      num_levels_to_skip *= 2;
 
-  closeFile(file);
+      /* at least skip header bytes, therefore use ">= 0" instead of "> 0" */
+      while (num_levels_to_skip >= 0)
+      {
+       /* advance file stream to next level inside the level package */
+       if (seekFile(file, skip_bytes, SEEK_CUR) != 0)
+       {
+         level->no_valid_file = TRUE;
 
-  level->fieldy = y;
+         Error(ERR_WARN, "cannot fseek in file '%s' -- using empty level",
+               filename);
 
-  level->fieldx = MIN(MAX(MIN_LEV_FIELDX, level->fieldx), MAX_LEV_FIELDX);
-  level->fieldy = MIN(MAX(MIN_LEV_FIELDY, level->fieldy), MAX_LEV_FIELDY);
+         return;
+       }
 
-  if (!reading_playfield)
-  {
-    level->no_valid_file = TRUE;
+       /* skip apparently unused extra bytes following each level */
+       ReadUnusedBytesFromFile(file, extra_bytes);
 
-    Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename);
+       /* read size of next level in level package */
+       skip_bytes = getFile32BitLE(file);
 
-    return;
-  }
+       num_levels_to_skip--;
+      }
+    }
+    else
+    {
+      level->no_valid_file = TRUE;
 
-  if (*level_name != '\0')
-  {
-    strncpy(level->name, level_name, MAX_LEVEL_NAME_LEN);
-    level->name[MAX_LEVEL_NAME_LEN] = '\0';
+      Error(ERR_WARN, "unknown DC2 level file '%s' -- using empty level",
+           filename);
 
-#if 0
-    printf(":1: level name: '%s'\n", level->name);
-#endif
+      return;
+    }
   }
-  else if (*last_comment != '\0')
-  {
-    strncpy(level->name, last_comment, MAX_LEVEL_NAME_LEN);
-    level->name[MAX_LEVEL_NAME_LEN] = '\0';
 
-#if 0
-    printf(":2: level name: '%s'\n", level->name);
-#endif
-  }
-  else
-  {
-    sprintf(level->name, "--> Level %d <--", level_file_info->nr);
-  }
+  LoadLevelFromFileStream_DC(file, level, level_file_info->nr);
 
-  /* set all empty fields beyond the border walls to invisible steel wall */
-  for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
-  {
-    if ((x == 0 || x == level->fieldx - 1 ||
-        y == 0 || y == level->fieldy - 1) &&
-       level->field[x][y] == getMappedElement_SB(' ', load_xsb_to_ces))
-      FloodFillLevel(x, y, getMappedElement_SB('_', load_xsb_to_ces),
-                    level->field, level->fieldx, level->fieldy);
-  }
+  closeFile(file);
+}
 
-  /* set special level settings for Sokoban levels */
 
-  level->time = 0;
-  level->use_step_counter = TRUE;
+/* ------------------------------------------------------------------------- */
+/* functions for loading SB level                                            */
+/* ------------------------------------------------------------------------- */
 
-  if (load_xsb_to_ces)
+int getMappedElement_SB(int element_ascii, boolean use_ces)
+{
+  static struct
   {
-#if 1
-    /* !!! special global settings can now be set in level template !!! */
-#else
-    level->initial_player_stepsize[0] = STEPSIZE_SLOW;
-#endif
-
-    /* fill smaller playfields with padding "beyond border wall" elements */
-    if (level->fieldx < SCR_FIELDX ||
-       level->fieldy < SCR_FIELDY)
-    {
-      short field[level->fieldx][level->fieldy];
-      int new_fieldx = MAX(level->fieldx, SCR_FIELDX);
-      int new_fieldy = MAX(level->fieldy, SCR_FIELDY);
-      int pos_fieldx = (new_fieldx - level->fieldx) / 2;
-      int pos_fieldy = (new_fieldy - level->fieldy) / 2;
-
-      /* copy old playfield (which is smaller than the visible area) */
-      for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
-       field[x][y] = level->field[x][y];
+    int ascii;
+    int sb;
+    int ce;
+  }
+  sb_element_mapping[] =
+  {
+    { ' ', EL_EMPTY,                EL_CUSTOM_1 },  /* floor (space) */
+    { '#', EL_STEELWALL,            EL_CUSTOM_2 },  /* wall */
+    { '@', EL_PLAYER_1,             EL_CUSTOM_3 },  /* player */
+    { '$', EL_SOKOBAN_OBJECT,       EL_CUSTOM_4 },  /* box */
+    { '.', EL_SOKOBAN_FIELD_EMPTY,  EL_CUSTOM_5 },  /* goal square */
+    { '*', EL_SOKOBAN_FIELD_FULL,   EL_CUSTOM_6 },  /* box on goal square */
+    { '+', EL_SOKOBAN_FIELD_PLAYER, EL_CUSTOM_7 },  /* player on goal square */
+    { '_', EL_INVISIBLE_STEELWALL,  EL_FROM_LEVEL_TEMPLATE },  /* floor beyond border */
 
-      /* fill new, larger playfield with "beyond border wall" elements */
-      for (y = 0; y < new_fieldy; y++) for (x = 0; x < new_fieldx; x++)
-       level->field[x][y] = getMappedElement_SB('_', load_xsb_to_ces);
+    { 0,   -1,                      -1          },
+  };
 
-      /* copy the old playfield to the middle of the new playfield */
-      for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
-       level->field[pos_fieldx + x][pos_fieldy + y] = field[x][y];
+  int i;
 
-      level->fieldx = new_fieldx;
-      level->fieldy = new_fieldy;
-    }
+  for (i = 0; sb_element_mapping[i].ascii != 0; i++)
+    if (element_ascii == sb_element_mapping[i].ascii)
+      return (use_ces ? sb_element_mapping[i].ce : sb_element_mapping[i].sb);
 
-    level->use_custom_template = TRUE;
-  }
+  return EL_UNDEFINED;
 }
 
-#else
-
 static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
                                     struct LevelFileInfo *level_file_info,
                                     boolean level_info_only)
@@ -8474,7 +5844,7 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
   char last_comment[MAX_LINE_LEN];
   char level_name[MAX_LINE_LEN];
   char *line_ptr;
-  FILE *file;
+  File *file;
   int num_levels_to_skip = level_file_info->nr - leveldir_current->first_level;
   boolean read_continued_line = FALSE;
   boolean reading_playfield = FALSE;
@@ -8485,15 +5855,10 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
   int line_nr = 0;
   int x = 0, y = 0;            /* initialized to make compilers happy */
 
-#if 0
-  printf("::: looking for level number %d [%d]\n",
-        level_file_info->nr, num_levels_to_skip);
-#endif
-
   last_comment[0] = '\0';
   level_name[0] = '\0';
 
-  if (!(file = fopen(filename, MODE_READ)))
+  if (!(file = openFile(filename, MODE_READ)))
   {
     level->no_valid_file = TRUE;
 
@@ -8503,15 +5868,11 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
     return;
   }
 
-  while (!feof(file))
+  while (!checkEndOfFile(file))
   {
     /* level successfully read, but next level may follow here */
     if (!got_valid_playfield_line && reading_playfield)
     {
-#if 0
-      printf("::: read complete playfield\n");
-#endif
-
       /* read playfield from single level file -- skip remaining file */
       if (!level_file_info->packed)
        break;
@@ -8530,7 +5891,7 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
     got_valid_playfield_line = FALSE;
 
     /* read next line of input file */
-    if (!fgets(line, MAX_LINE_LEN, file))
+    if (!getStringFromFile(file, line, MAX_LINE_LEN))
       break;
 
     /* check if line was completely read and is terminated by line break */
@@ -8580,10 +5941,6 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
 
       strcpy(last_comment, line_ptr);
 
-#if 0
-      printf("::: found comment '%s' in line %d\n", last_comment, line_nr);
-#endif
-
       continue;
     }
 
@@ -8595,10 +5952,6 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
       if (strlen(level_name) > 0 && level_name[strlen(level_name) - 1] == '\'')
        level_name[strlen(level_name) - 1] = '\0';
 
-#if 0
-      printf("::: found level name '%s' in line %d\n", level_name, line_nr);
-#endif
-
       continue;
     }
 
@@ -8611,10 +5964,6 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
 
     /* at this point, we have found a line containing part of a playfield */
 
-#if 0
-    printf("::: found playfield row in line %d\n", line_nr);
-#endif
-
     got_valid_playfield_line = TRUE;
 
     if (!reading_playfield)
@@ -8677,7 +6026,7 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
     y++;
   }
 
-  fclose(file);
+  closeFile(file);
 
   level->fieldy = y;
 
@@ -8697,19 +6046,11 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
   {
     strncpy(level->name, level_name, MAX_LEVEL_NAME_LEN);
     level->name[MAX_LEVEL_NAME_LEN] = '\0';
-
-#if 0
-    printf(":1: level name: '%s'\n", level->name);
-#endif
   }
   else if (*last_comment != '\0')
   {
     strncpy(level->name, last_comment, MAX_LEVEL_NAME_LEN);
     level->name[MAX_LEVEL_NAME_LEN] = '\0';
-
-#if 0
-    printf(":2: level name: '%s'\n", level->name);
-#endif
   }
   else
   {
@@ -8733,44 +6074,12 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
 
   if (load_xsb_to_ces)
   {
-#if 1
-    /* !!! special global settings can now be set in level template !!! */
-#else
-    level->initial_player_stepsize[0] = STEPSIZE_SLOW;
-#endif
-
-    /* fill smaller playfields with padding "beyond border wall" elements */
-    if (level->fieldx < SCR_FIELDX ||
-       level->fieldy < SCR_FIELDY)
-    {
-      short field[level->fieldx][level->fieldy];
-      int new_fieldx = MAX(level->fieldx, SCR_FIELDX);
-      int new_fieldy = MAX(level->fieldy, SCR_FIELDY);
-      int pos_fieldx = (new_fieldx - level->fieldx) / 2;
-      int pos_fieldy = (new_fieldy - level->fieldy) / 2;
-
-      /* copy old playfield (which is smaller than the visible area) */
-      for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
-       field[x][y] = level->field[x][y];
-
-      /* fill new, larger playfield with "beyond border wall" elements */
-      for (y = 0; y < new_fieldy; y++) for (x = 0; x < new_fieldx; x++)
-       level->field[x][y] = getMappedElement_SB('_', load_xsb_to_ces);
-
-      /* copy the old playfield to the middle of the new playfield */
-      for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
-       level->field[pos_fieldx + x][pos_fieldy + y] = field[x][y];
-
-      level->fieldx = new_fieldx;
-      level->fieldy = new_fieldy;
-    }
+    /* special global settings can now be set in level template */
 
     level->use_custom_template = TRUE;
   }
 }
 
-#endif
-
 
 /* ------------------------------------------------------------------------- */
 /* functions for handling native levels                                      */
@@ -8798,12 +6107,22 @@ static void LoadLevelFromFileInfo_SP(struct LevelInfo *level,
     level->no_valid_file = TRUE;
 }
 
+static void LoadLevelFromFileInfo_MM(struct LevelInfo *level,
+                                    struct LevelFileInfo *level_file_info,
+                                    boolean level_info_only)
+{
+  if (!LoadNativeLevel_MM(level_file_info->filename, level_info_only))
+    level->no_valid_file = TRUE;
+}
+
 void CopyNativeLevel_RND_to_Native(struct LevelInfo *level)
 {
   if (level->game_engine_type == GAME_ENGINE_TYPE_EM)
     CopyNativeLevel_RND_to_EM(level);
   else if (level->game_engine_type == GAME_ENGINE_TYPE_SP)
     CopyNativeLevel_RND_to_SP(level);
+  else if (level->game_engine_type == GAME_ENGINE_TYPE_MM)
+    CopyNativeLevel_RND_to_MM(level);
 }
 
 void CopyNativeLevel_Native_to_RND(struct LevelInfo *level)
@@ -8812,6 +6131,8 @@ void CopyNativeLevel_Native_to_RND(struct LevelInfo *level)
     CopyNativeLevel_EM_to_RND(level);
   else if (level->game_engine_type == GAME_ENGINE_TYPE_SP)
     CopyNativeLevel_SP_to_RND(level);
+  else if (level->game_engine_type == GAME_ENGINE_TYPE_MM)
+    CopyNativeLevel_MM_to_RND(level);
 }
 
 void SaveNativeLevel(struct LevelInfo *level)
@@ -8838,7 +6159,7 @@ static void LoadLevelFromFileInfo(struct LevelInfo *level,
                                  boolean level_info_only)
 {
   /* always start with reliable default values */
-  setLevelInfoToDefaults(level, level_info_only);
+  setLevelInfoToDefaults(level, level_info_only, TRUE);
 
   switch (level_file_info->type)
   {
@@ -8856,6 +6177,11 @@ static void LoadLevelFromFileInfo(struct LevelInfo *level,
       level->game_engine_type = GAME_ENGINE_TYPE_SP;
       break;
 
+    case LEVEL_FILE_TYPE_MM:
+      LoadLevelFromFileInfo_MM(level, level_file_info, level_info_only);
+      level->game_engine_type = GAME_ENGINE_TYPE_MM;
+      break;
+
     case LEVEL_FILE_TYPE_DC:
       LoadLevelFromFileInfo_DC(level, level_file_info, level_info_only);
       break;
@@ -8871,11 +6197,7 @@ static void LoadLevelFromFileInfo(struct LevelInfo *level,
 
   /* if level file is invalid, restore level structure to default values */
   if (level->no_valid_file)
-  {
-    setLevelInfoToDefaults(level, level_info_only);
-
-    level->no_valid_file = TRUE;       /* but keep "no valid file" flag */
-  }
+    setLevelInfoToDefaults(level, level_info_only, FALSE);
 
   if (level->game_engine_type == GAME_ENGINE_TYPE_UNKNOWN)
     level->game_engine_type = GAME_ENGINE_TYPE_RND;
@@ -8893,12 +6215,13 @@ void LoadLevelFromFilename(struct LevelInfo *level, char *filename)
 
   level_file_info.nr = 0;                      /* unknown level number */
   level_file_info.type = LEVEL_FILE_TYPE_RND;  /* no others supported yet */
-  level_file_info.filename = filename;
+
+  setString(&level_file_info.filename, filename);
 
   LoadLevelFromFileInfo(level, &level_file_info, FALSE);
 }
 
-static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename)
+static void LoadLevel_InitVersion(struct LevelInfo *level)
 {
   int i, j;
 
@@ -8912,10 +6235,6 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename)
     level->score[SC_TIME_BONUS] /= 10;
   }
 
-#if 0
-  leveldir_current->latest_engine = TRUE;      /* !!! TEST ONLY !!! */
-#endif
-
   if (leveldir_current->latest_engine)
   {
     /* ---------- use latest game engine ----------------------------------- */
@@ -8978,11 +6297,6 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename)
 
     /* extra time score was same value as time left score before 3.2.0-5 */
     level->extra_time_score = level->score[SC_TIME_BONUS];
-
-#if 0
-    /* time bonus score was given for 10 s instead of 1 s before 3.2.0-5 */
-    level->score[SC_TIME_BONUS] /= 10;
-#endif
   }
 
   if (level->game_version < VERSION_IDENT(3,2,0,7))
@@ -9047,37 +6361,9 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename)
       change->target_element = EL_PLAYER_1;
   }
 
-#if 1
   /* try to detect and fix "Zelda" style levels, which are broken with 3.2.5 */
   if (level->game_version < VERSION_IDENT(3,2,5,0))
-  {
-    /* This is needed to fix a problem that was caused by a bugfix in function
-       game.c/CheckTriggeredElementChangeExt() introduced with 3.2.5 that
-       corrects the behaviour when a custom element changes to another custom
-       element with a higher element number that has change actions defined.
-       Normally, only one change per frame is allowed for custom elements.
-       Therefore, it is checked if a custom element already changed in the
-       current frame; if it did, subsequent changes are suppressed.
-       Unfortunately, this is only checked for element changes, but not for
-       change actions, which are still executed. As the function above loops
-       through all custom elements from lower to higher, an element change
-       resulting in a lower CE number won't be checked again, while a target
-       element with a higher number will also be checked, and potential change
-       actions will get executed for this CE, too (which is wrong), while
-       further changes are ignored (which is correct). As this bugfix breaks
-       Zelda II (and introduces graphical bugs to Zelda I, and also breaks a
-       few other levels like Alan Bond's "FMV"), allow the previous, incorrect
-       behaviour for existing levels and tapes that make use of this bug */
-
-    level->use_action_after_change_bug = TRUE;
-  }
-#else
-  /* !!! THIS DOES NOT FIX "Zelda I" (GRAPHICALLY) AND "Alan's FMV" LEVELS */
-  /* try to detect and fix "Zelda II" levels, which are broken with 3.2.5 */
-  {
-    int element = EL_CUSTOM_16;
-    struct ElementInfo *ei = &element_info[element];
-
+  {
     /* This is needed to fix a problem that was caused by a bugfix in function
        game.c/CheckTriggeredElementChangeExt() introduced with 3.2.5 that
        corrects the behaviour when a custom element changes to another custom
@@ -9092,14 +6378,12 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename)
        element with a higher number will also be checked, and potential change
        actions will get executed for this CE, too (which is wrong), while
        further changes are ignored (which is correct). As this bugfix breaks
-       Zelda II (but no other levels), allow the previous, incorrect behaviour
-       for this outstanding level set to not break the game or existing tapes */
+       Zelda II (and introduces graphical bugs to Zelda I, and also breaks a
+       few other levels like Alan Bond's "FMV"), allow the previous, incorrect
+       behaviour for existing levels and tapes that make use of this bug */
 
-    if (strncmp(leveldir_current->identifier, "zelda2", 6) == 0 ||
-       strncmp(ei->description, "scanline - row 1", 16) == 0)
-      level->use_action_after_change_bug = TRUE;
+    level->use_action_after_change_bug = TRUE;
   }
-#endif
 
   /* not centering level after relocating player was default only in 3.2.3 */
   if (level->game_version == VERSION_IDENT(3,2,3,0))   /* (no pre-releases) */
@@ -9110,9 +6394,25 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename)
     level->em_explodes_by_fire = TRUE;
 }
 
-static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
+static void LoadLevel_InitStandardElements(struct LevelInfo *level)
 {
-  int i, j, x, y;
+  int i, x, y;
+
+  /* map elements that have changed in newer versions */
+  level->amoeba_content = getMappedElementByVersion(level->amoeba_content,
+                                                   level->game_version);
+  for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
+    for (x = 0; x < 3; x++)
+      for (y = 0; y < 3; y++)
+       level->yamyam_content[i].e[x][y] =
+         getMappedElementByVersion(level->yamyam_content[i].e[x][y],
+                                   level->game_version);
+
+}
+
+static void LoadLevel_InitCustomElements(struct LevelInfo *level)
+{
+  int i, j;
 
   /* map custom element change events that have changed in newer versions
      (these following values were accidentally changed in version 3.0.1)
@@ -9226,23 +6526,34 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
     }
   }
 
-  /* map elements that have changed in newer versions */
-  level->amoeba_content = getMappedElementByVersion(level->amoeba_content,
-                                                   level->game_version);
-  for (i = 0; i < MAX_ELEMENT_CONTENTS; i++)
-    for (x = 0; x < 3; x++)
-      for (y = 0; y < 3; y++)
-       level->yamyam_content[i].e[x][y] =
-         getMappedElementByVersion(level->yamyam_content[i].e[x][y],
-                                   level->game_version);
+  /* set some other uninitialized values of custom elements in older levels */
+  if (level->game_version < VERSION_IDENT(3,1,0,0))
+  {
+    for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
+    {
+      int element = EL_CUSTOM_START + i;
+
+      element_info[element].access_direction = MV_ALL_DIRECTIONS;
+
+      element_info[element].explosion_delay = 17;
+      element_info[element].ignition_delay = 8;
+    }
+  }
+}
+
+static void LoadLevel_InitElements(struct LevelInfo *level)
+{
+  LoadLevel_InitStandardElements(level);
+
+  if (level->file_has_custom_elements)
+    LoadLevel_InitCustomElements(level);
 
   /* initialize element properties for level editor etc. */
   InitElementPropertiesEngine(level->game_version);
-  InitElementPropertiesAfterLoading(level->game_version);
   InitElementPropertiesGfxElement();
 }
 
-static void LoadLevel_InitPlayfield(struct LevelInfo *level, char *filename)
+static void LoadLevel_InitPlayfield(struct LevelInfo *level)
 {
   int x, y;
 
@@ -9252,6 +6563,12 @@ static void LoadLevel_InitPlayfield(struct LevelInfo *level, char *filename)
       level->field[x][y] = getMappedElementByVersion(level->field[x][y],
                                                     level->game_version);
 
+  /* clear unused playfield data (nicer if level gets resized in editor) */
+  for (x = 0; x < MAX_LEV_FIELDX; x++)
+    for (y = 0; y < MAX_LEV_FIELDY; y++)
+      if (x >= level->fieldx || y >= level->fieldy)
+       level->field[x][y] = EL_EMPTY;
+
   /* copy elements to runtime playfield array */
   for (x = 0; x < MAX_LEV_FIELDX; x++)
     for (y = 0; y < MAX_LEV_FIELDY; y++)
@@ -9268,7 +6585,7 @@ static void LoadLevel_InitPlayfield(struct LevelInfo *level, char *filename)
     SetBorderElement();
 }
 
-static void LoadLevel_InitNativeEngines(struct LevelInfo *level,char *filename)
+static void LoadLevel_InitNativeEngines(struct LevelInfo *level)
 {
   struct LevelFileInfo *level_file_info = &level->file_info;
 
@@ -9276,54 +6593,78 @@ static void LoadLevel_InitNativeEngines(struct LevelInfo *level,char *filename)
     CopyNativeLevel_RND_to_Native(level);
 }
 
-void LoadLevelTemplate(int nr)
+static void LoadLevelTemplate_LoadAndInit()
 {
-  char *filename;
-
-  setLevelFileInfo(&level_template.file_info, nr);
-  filename = level_template.file_info.filename;
-
   LoadLevelFromFileInfo(&level_template, &level_template.file_info, FALSE);
 
-  LoadLevel_InitVersion(&level_template, filename);
-  LoadLevel_InitElements(&level_template, filename);
+  LoadLevel_InitVersion(&level_template);
+  LoadLevel_InitElements(&level_template);
 
   ActivateLevelTemplate();
 }
 
-void LoadLevel(int nr)
+void LoadLevelTemplate(int nr)
 {
-  char *filename;
+  if (!fileExists(getGlobalLevelTemplateFilename()))
+  {
+    Error(ERR_WARN, "no level template found for this level");
 
-  setLevelFileInfo(&level.file_info, nr);
-  filename = level.file_info.filename;
+    return;
+  }
+
+  setLevelFileInfo(&level_template.file_info, nr);
+
+  LoadLevelTemplate_LoadAndInit();
+}
+
+static void LoadLevelTemplateFromNetwork(struct LevelFileInfo *lfi_network_template)
+{
+  copyLevelFileInfo(lfi_network_template, &level_template.file_info);
+
+  LoadLevelTemplate_LoadAndInit();
+}
 
+static void LoadLevel_LoadAndInit(struct LevelFileInfo *lfi_network_template)
+{
   LoadLevelFromFileInfo(&level, &level.file_info, FALSE);
 
   if (level.use_custom_template)
-    LoadLevelTemplate(-1);
+  {
+    if (lfi_network_template != NULL)
+      LoadLevelTemplateFromNetwork(lfi_network_template);
+    else
+      LoadLevelTemplate(-1);
+  }
 
-  LoadLevel_InitVersion(&level, filename);
-  LoadLevel_InitElements(&level, filename);
-  LoadLevel_InitPlayfield(&level, filename);
+  LoadLevel_InitVersion(&level);
+  LoadLevel_InitElements(&level);
+  LoadLevel_InitPlayfield(&level);
 
-  LoadLevel_InitNativeEngines(&level, filename);
+  LoadLevel_InitNativeEngines(&level);
 }
 
-void LoadLevelInfoOnly(int nr)
+void LoadLevel(int nr)
 {
-#if 0
-  char *filename;
-#endif
+  setLevelFileInfo(&level.file_info, nr);
+
+  LoadLevel_LoadAndInit(NULL);
+}
 
+void LoadLevelInfoOnly(int nr)
+{
   setLevelFileInfo(&level.file_info, nr);
-#if 0
-  filename = level.file_info.filename;
-#endif
 
   LoadLevelFromFileInfo(&level, &level.file_info, TRUE);
 }
 
+void LoadLevelFromNetwork(struct LevelFileInfo *lfi_network_level,
+                         struct LevelFileInfo *lfi_network_template)
+{
+  copyLevelFileInfo(lfi_network_level, &level.file_info);
+
+  LoadLevel_LoadAndInit(lfi_network_template);
+}
+
 static int SaveLevel_VERS(FILE *file, struct LevelInfo *level)
 {
   int chunk_size = 0;
@@ -9345,7 +6686,7 @@ static int SaveLevel_DATE(FILE *file, struct LevelInfo *level)
   return chunk_size;
 }
 
-#if 0
+#if ENABLE_HISTORIC_CHUNKS
 static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level)
 {
   int i, x, y;
@@ -9419,7 +6760,7 @@ static int SaveLevel_AUTH(FILE *file, struct LevelInfo *level)
   return chunk_size;
 }
 
-#if 0
+#if ENABLE_HISTORIC_CHUNKS
 static int SaveLevel_BODY(FILE *file, struct LevelInfo *level)
 {
   int chunk_size = 0;
@@ -9448,7 +6789,7 @@ static int SaveLevel_BODY(FILE *file, struct LevelInfo *level)
   return chunk_size;
 }
 
-#if 0
+#if ENABLE_HISTORIC_CHUNKS
 static void SaveLevel_CONT(FILE *file, struct LevelInfo *level)
 {
   int i, x, y;
@@ -9468,7 +6809,7 @@ static void SaveLevel_CONT(FILE *file, struct LevelInfo *level)
 }
 #endif
 
-#if 0
+#if ENABLE_HISTORIC_CHUNKS
 static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
 {
   int i, x, y;
@@ -9521,7 +6862,7 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
 }
 #endif
 
-#if 0
+#if ENABLE_HISTORIC_CHUNKS
 static int SaveLevel_CNT3(FILE *file, struct LevelInfo *level, int element)
 {
   int envelope_nr = element - EL_ENVELOPE_1;
@@ -9544,7 +6885,7 @@ static int SaveLevel_CNT3(FILE *file, struct LevelInfo *level, int element)
 }
 #endif
 
-#if 0
+#if ENABLE_HISTORIC_CHUNKS
 static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level,
                           int num_changed_custom_elements)
 {
@@ -9575,7 +6916,7 @@ static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level,
 }
 #endif
 
-#if 0
+#if ENABLE_HISTORIC_CHUNKS
 static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level,
                           int num_changed_custom_elements)
 {
@@ -9604,7 +6945,7 @@ static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level,
 }
 #endif
 
-#if 0
+#if ENABLE_HISTORIC_CHUNKS
 static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level,
                           int num_changed_custom_elements)
 {
@@ -9687,7 +7028,7 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level,
 }
 #endif
 
-#if 0
+#if ENABLE_HISTORIC_CHUNKS
 static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element)
 {
   struct ElementInfo *ei = &element_info[element];
@@ -9807,7 +7148,7 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element)
 }
 #endif
 
-#if 0
+#if ENABLE_HISTORIC_CHUNKS
 static void SaveLevel_GRP1(FILE *file, struct LevelInfo *level, int element)
 {
   struct ElementInfo *ei = &element_info[element];
@@ -10009,12 +7350,6 @@ static int SaveLevel_CUSX(FILE *file, struct LevelInfo *level, int element)
   /* set default description string for this specific element */
   strcpy(xx_default_description, getDefaultElementDescription(ei));
 
-#if 0
-  /* set (fixed) number of content areas (may be wrong by broken level file) */
-  /* (this is now directly corrected for broken level files after loading) */
-  xx_num_contents = 1;
-#endif
-
   for (i = 0; chunk_config_CUSX_base[i].data_type != -1; i++)
     chunk_size += SaveLevel_MicroChunk(file, &chunk_config_CUSX_base[i], FALSE);
 
@@ -10058,7 +7393,8 @@ static int SaveLevel_GRPX(FILE *file, struct LevelInfo *level, int element)
   return chunk_size;
 }
 
-static void SaveLevelFromFilename(struct LevelInfo *level, char *filename)
+static void SaveLevelFromFilename(struct LevelInfo *level, char *filename,
+                                 boolean save_as_template)
 {
   int chunk_size;
   int i;
@@ -10122,7 +7458,7 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename)
   }
 
   /* if not using template level, check for non-default custom/group elements */
-  if (!level->use_custom_template)
+  if (!level->use_custom_template || save_as_template)
   {
     for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
     {
@@ -10158,14 +7494,14 @@ void SaveLevel(int nr)
 {
   char *filename = getDefaultLevelFilename(nr);
 
-  SaveLevelFromFilename(&level, filename);
+  SaveLevelFromFilename(&level, filename, FALSE);
 }
 
 void SaveLevelTemplate()
 {
-  char *filename = getDefaultLevelFilename(-1);
+  char *filename = getLocalLevelTemplateFilename();
 
-  SaveLevelFromFilename(&level, filename);
+  SaveLevelFromFilename(&level, filename, TRUE);
 }
 
 boolean SaveLevelChecked(int nr)
@@ -10189,230 +7525,75 @@ boolean SaveLevelChecked(int nr)
 
 void DumpLevel(struct LevelInfo *level)
 {
-  if (level->no_valid_file)
+  if (level->no_level_file || level->no_valid_file)
   {
     Error(ERR_WARN, "cannot dump -- no valid level file found");
 
     return;
   }
 
-  printf_line("-", 79);
-  printf("Level xxx (file version %08d, game version %08d)\n",
-        level->file_version, level->game_version);
-  printf_line("-", 79);
-
-  printf("Level author: '%s'\n", level->author);
-  printf("Level title:  '%s'\n", level->name);
-  printf("\n");
-  printf("Playfield size: %d x %d\n", level->fieldx, level->fieldy);
-  printf("\n");
-  printf("Level time:  %d seconds\n", level->time);
-  printf("Gems needed: %d\n", level->gems_needed);
-  printf("\n");
-  printf("Time for magic wall: %d seconds\n", level->time_magic_wall);
-  printf("Time for wheel:      %d seconds\n", level->time_wheel);
-  printf("Time for light:      %d seconds\n", level->time_light);
-  printf("Time for timegate:   %d seconds\n", level->time_timegate);
-  printf("\n");
-  printf("Amoeba speed: %d\n", level->amoeba_speed);
-  printf("\n");
-
-  printf("EM style slippery gems:      %s\n", (level->em_slippery_gems ? "yes" : "no"));
-  printf("Player blocks last field:    %s\n", (level->block_last_field ? "yes" : "no"));
-  printf("SP player blocks last field: %s\n", (level->sp_block_last_field ? "yes" : "no"));
-  printf("use spring bug: %s\n", (level->use_spring_bug ? "yes" : "no"));
-  printf("use step counter: %s\n", (level->use_step_counter ? "yes" : "no"));
-
-  printf_line("-", 79);
-}
-
-
-/* ========================================================================= */
-/* tape file functions                                                       */
-/* ========================================================================= */
-
-static void setTapeInfoToDefaults()
-{
-  int i;
-
-  /* always start with reliable default values (empty tape) */
-  TapeErase();
-
-  /* default values (also for pre-1.2 tapes) with only the first player */
-  tape.player_participates[0] = TRUE;
-  for (i = 1; i < MAX_PLAYERS; i++)
-    tape.player_participates[i] = FALSE;
-
-  /* at least one (default: the first) player participates in every tape */
-  tape.num_participating_players = 1;
-
-  tape.level_nr = level_nr;
-  tape.counter = 0;
-  tape.changed = FALSE;
-
-  tape.recording = FALSE;
-  tape.playing = FALSE;
-  tape.pausing = FALSE;
-
-  tape.no_valid_file = FALSE;
-}
-
-#if 1
-
-static int LoadTape_VERS(File *file, int chunk_size, struct TapeInfo *tape)
-{
-  tape->file_version = getFileVersion(file);
-  tape->game_version = getFileVersion(file);
-
-  return chunk_size;
-}
-
-static int LoadTape_HEAD(File *file, int chunk_size, struct TapeInfo *tape)
-{
-  int i;
-
-  tape->random_seed = getFile32BitBE(file);
-  tape->date        = getFile32BitBE(file);
-  tape->length      = getFile32BitBE(file);
-
-  /* read header fields that are new since version 1.2 */
-  if (tape->file_version >= FILE_VERSION_1_2)
-  {
-    byte store_participating_players = getFile8Bit(file);
-    int engine_version;
-
-    /* since version 1.2, tapes store which players participate in the tape */
-    tape->num_participating_players = 0;
-    for (i = 0; i < MAX_PLAYERS; i++)
-    {
-      tape->player_participates[i] = FALSE;
-
-      if (store_participating_players & (1 << i))
-      {
-       tape->player_participates[i] = TRUE;
-       tape->num_participating_players++;
-      }
-    }
-
-    ReadUnusedBytesFromFile(file, TAPE_CHUNK_HEAD_UNUSED);
-
-    engine_version = getFileVersion(file);
-    if (engine_version > 0)
-      tape->engine_version = engine_version;
-    else
-      tape->engine_version = tape->game_version;
-  }
-
-  return chunk_size;
-}
-
-static int LoadTape_INFO(File *file, int chunk_size, struct TapeInfo *tape)
-{
-  int level_identifier_size;
-  int i;
-
-  level_identifier_size = getFile16BitBE(file);
-
-  tape->level_identifier =
-    checked_realloc(tape->level_identifier, level_identifier_size);
-
-  for (i = 0; i < level_identifier_size; i++)
-    tape->level_identifier[i] = getFile8Bit(file);
+  PrintLine("-", 79);
+  Print("Level xxx (file version %08d, game version %08d)\n",
+       level->file_version, level->game_version);
+  PrintLine("-", 79);
 
-  tape->level_nr = getFile16BitBE(file);
+  Print("Level author: '%s'\n", level->author);
+  Print("Level title:  '%s'\n", level->name);
+  Print("\n");
+  Print("Playfield size: %d x %d\n", level->fieldx, level->fieldy);
+  Print("\n");
+  Print("Level time:  %d seconds\n", level->time);
+  Print("Gems needed: %d\n", level->gems_needed);
+  Print("\n");
+  Print("Time for magic wall: %d seconds\n", level->time_magic_wall);
+  Print("Time for wheel:      %d seconds\n", level->time_wheel);
+  Print("Time for light:      %d seconds\n", level->time_light);
+  Print("Time for timegate:   %d seconds\n", level->time_timegate);
+  Print("\n");
+  Print("Amoeba speed: %d\n", level->amoeba_speed);
+  Print("\n");
 
-  chunk_size = 2 + level_identifier_size + 2;
+  Print("EM style slippery gems:      %s\n", (level->em_slippery_gems ? "yes" : "no"));
+  Print("Player blocks last field:    %s\n", (level->block_last_field ? "yes" : "no"));
+  Print("SP player blocks last field: %s\n", (level->sp_block_last_field ? "yes" : "no"));
+  Print("use spring bug: %s\n", (level->use_spring_bug ? "yes" : "no"));
+  Print("use step counter: %s\n", (level->use_step_counter ? "yes" : "no"));
 
-  return chunk_size;
+  PrintLine("-", 79);
 }
 
-static int LoadTape_BODY(File *file, int chunk_size, struct TapeInfo *tape)
-{
-  int i, j;
-  int chunk_size_expected =
-    (tape->num_participating_players + 1) * tape->length;
-
-  if (chunk_size_expected != chunk_size)
-  {
-    ReadUnusedBytesFromFile(file, chunk_size);
-    return chunk_size_expected;
-  }
-
-  for (i = 0; i < tape->length; i++)
-  {
-    if (i >= MAX_TAPE_LEN)
-      break;
-
-    for (j = 0; j < MAX_PLAYERS; j++)
-    {
-      tape->pos[i].action[j] = MV_NONE;
-
-      if (tape->player_participates[j])
-       tape->pos[i].action[j] = getFile8Bit(file);
-    }
-
-    tape->pos[i].delay = getFile8Bit(file);
-
-    if (tape->file_version == FILE_VERSION_1_0)
-    {
-      /* eliminate possible diagonal moves in old tapes */
-      /* this is only for backward compatibility */
-
-      byte joy_dir[4] = { JOY_LEFT, JOY_RIGHT, JOY_UP, JOY_DOWN };
-      byte action = tape->pos[i].action[0];
-      int k, num_moves = 0;
-
-      for (k = 0; k<4; k++)
-      {
-       if (action & joy_dir[k])
-       {
-         tape->pos[i + num_moves].action[0] = joy_dir[k];
-         if (num_moves > 0)
-           tape->pos[i + num_moves].delay = 0;
-         num_moves++;
-       }
-      }
-
-      if (num_moves > 1)
-      {
-       num_moves--;
-       i += num_moves;
-       tape->length += num_moves;
-      }
-    }
-    else if (tape->file_version < FILE_VERSION_2_0)
-    {
-      /* convert pre-2.0 tapes to new tape format */
 
-      if (tape->pos[i].delay > 1)
-      {
-       /* action part */
-       tape->pos[i + 1] = tape->pos[i];
-       tape->pos[i + 1].delay = 1;
+/* ========================================================================= */
+/* tape file functions                                                       */
+/* ========================================================================= */
 
-       /* delay part */
-       for (j = 0; j < MAX_PLAYERS; j++)
-         tape->pos[i].action[j] = MV_NONE;
-       tape->pos[i].delay--;
+static void setTapeInfoToDefaults()
+{
+  int i;
 
-       i++;
-       tape->length++;
-      }
-    }
+  /* always start with reliable default values (empty tape) */
+  TapeErase();
 
-    if (checkEndOfFile(file))
-      break;
-  }
+  /* default values (also for pre-1.2 tapes) with only the first player */
+  tape.player_participates[0] = TRUE;
+  for (i = 1; i < MAX_PLAYERS; i++)
+    tape.player_participates[i] = FALSE;
 
-  if (i != tape->length)
-    chunk_size = (tape->num_participating_players + 1) * i;
+  /* at least one (default: the first) player participates in every tape */
+  tape.num_participating_players = 1;
 
-  return chunk_size;
-}
+  tape.level_nr = level_nr;
+  tape.counter = 0;
+  tape.changed = FALSE;
 
-#else
+  tape.recording = FALSE;
+  tape.playing = FALSE;
+  tape.pausing = FALSE;
 
-static int LoadTape_VERS(FILE *file, int chunk_size, struct TapeInfo *tape)
+  tape.no_valid_file = FALSE;
+}
+
+static int LoadTape_VERS(File *file, int chunk_size, struct TapeInfo *tape)
 {
   tape->file_version = getFileVersion(file);
   tape->game_version = getFileVersion(file);
@@ -10420,7 +7601,7 @@ static int LoadTape_VERS(FILE *file, int chunk_size, struct TapeInfo *tape)
   return chunk_size;
 }
 
-static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape)
+static int LoadTape_HEAD(File *file, int chunk_size, struct TapeInfo *tape)
 {
   int i;
 
@@ -10447,6 +7628,8 @@ static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape)
       }
     }
 
+    tape->use_mouse = (getFile8Bit(file) == 1 ? TRUE : FALSE);
+
     ReadUnusedBytesFromFile(file, TAPE_CHUNK_HEAD_UNUSED);
 
     engine_version = getFileVersion(file);
@@ -10459,7 +7642,7 @@ static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape)
   return chunk_size;
 }
 
-static int LoadTape_INFO(FILE *file, int chunk_size, struct TapeInfo *tape)
+static int LoadTape_INFO(File *file, int chunk_size, struct TapeInfo *tape)
 {
   int level_identifier_size;
   int i;
@@ -10479,11 +7662,12 @@ static int LoadTape_INFO(FILE *file, int chunk_size, struct TapeInfo *tape)
   return chunk_size;
 }
 
-static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape)
+static int LoadTape_BODY(File *file, int chunk_size, struct TapeInfo *tape)
 {
   int i, j;
-  int chunk_size_expected =
-    (tape->num_participating_players + 1) * tape->length;
+  int tape_pos_size =
+    (tape->use_mouse ? 3 : tape->num_participating_players) + 1;
+  int chunk_size_expected = tape_pos_size * tape->length;
 
   if (chunk_size_expected != chunk_size)
   {
@@ -10494,14 +7678,34 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape)
   for (i = 0; i < tape->length; i++)
   {
     if (i >= MAX_TAPE_LEN)
+    {
+      Error(ERR_WARN, "tape truncated -- size exceeds maximum tape size %d",
+           MAX_TAPE_LEN);
+
+      // tape too large; read and ignore remaining tape data from this chunk
+      for (;i < tape->length; i++)
+       ReadUnusedBytesFromFile(file, tape->num_participating_players + 1);
+
       break;
+    }
 
-    for (j = 0; j < MAX_PLAYERS; j++)
+    if (tape->use_mouse)
     {
-      tape->pos[i].action[j] = MV_NONE;
+      tape->pos[i].action[TAPE_ACTION_LX]     = getFile8Bit(file);
+      tape->pos[i].action[TAPE_ACTION_LY]     = getFile8Bit(file);
+      tape->pos[i].action[TAPE_ACTION_BUTTON] = getFile8Bit(file);
 
-      if (tape->player_participates[j])
-       tape->pos[i].action[j] = getFile8Bit(file);
+      tape->pos[i].action[TAPE_ACTION_UNUSED] = 0;
+    }
+    else
+    {
+      for (j = 0; j < MAX_PLAYERS; j++)
+      {
+       tape->pos[i].action[j] = MV_NONE;
+
+       if (tape->player_participates[j])
+         tape->pos[i].action[j] = getFile8Bit(file);
+      }
     }
 
     tape->pos[i].delay = getFile8Bit(file);
@@ -10553,20 +7757,16 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape)
       }
     }
 
-    if (feof(file))
+    if (checkEndOfFile(file))
       break;
   }
 
   if (i != tape->length)
-    chunk_size = (tape->num_participating_players + 1) * i;
+    chunk_size = tape_pos_size * i;
 
   return chunk_size;
 }
 
-#endif
-
-#if 1
-
 void LoadTape_SokobanSolution(char *filename)
 {
   File *file;
@@ -10579,301 +7779,73 @@ void LoadTape_SokobanSolution(char *filename)
     return;
   }
 
-  while (!checkEndOfFile(file))
-  {
-    unsigned char c = getByteFromFile(file);
-
-    if (checkEndOfFile(file))
-      break;
-
-    switch (c)
-    {
-      case 'u':
-      case 'U':
-       tape.pos[tape.length].action[0] = MV_UP;
-       tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0);
-       tape.length++;
-       break;
-
-      case 'd':
-      case 'D':
-       tape.pos[tape.length].action[0] = MV_DOWN;
-       tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0);
-       tape.length++;
-       break;
-
-      case 'l':
-      case 'L':
-       tape.pos[tape.length].action[0] = MV_LEFT;
-       tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0);
-       tape.length++;
-       break;
-
-      case 'r':
-      case 'R':
-       tape.pos[tape.length].action[0] = MV_RIGHT;
-       tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0);
-       tape.length++;
-       break;
-
-      case '\n':
-      case '\r':
-      case '\t':
-      case ' ':
-       /* ignore white-space characters */
-       break;
-
-      default:
-       tape.no_valid_file = TRUE;
-
-       Error(ERR_WARN, "unsupported Sokoban solution file '%s' ['%d']", filename, c);
-
-       break;
-    }
-  }
-
-  closeFile(file);
-
-  if (tape.no_valid_file)
-    return;
-
-  tape.length_seconds = GetTapeLength();
-}
-
-#else
-
-void LoadTape_SokobanSolution(char *filename)
-{
-  FILE *file;
-  int move_delay = TILESIZE / level.initial_player_stepsize[0];
-
-  if (!(file = fopen(filename, MODE_READ)))
-  {
-    tape.no_valid_file = TRUE;
-
-    return;
-  }
-
-  while (!feof(file))
-  {
-    unsigned char c = fgetc(file);
-
-    if (feof(file))
-      break;
-
-    switch (c)
-    {
-      case 'u':
-      case 'U':
-       tape.pos[tape.length].action[0] = MV_UP;
-       tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0);
-       tape.length++;
-       break;
-
-      case 'd':
-      case 'D':
-       tape.pos[tape.length].action[0] = MV_DOWN;
-       tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0);
-       tape.length++;
-       break;
-
-      case 'l':
-      case 'L':
-       tape.pos[tape.length].action[0] = MV_LEFT;
-       tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0);
-       tape.length++;
-       break;
-
-      case 'r':
-      case 'R':
-       tape.pos[tape.length].action[0] = MV_RIGHT;
-       tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0);
-       tape.length++;
-       break;
-
-      case '\n':
-      case '\r':
-      case '\t':
-      case ' ':
-       /* ignore white-space characters */
-       break;
-
-      default:
-       tape.no_valid_file = TRUE;
-
-       Error(ERR_WARN, "unsupported Sokoban solution file '%s' ['%d']", filename, c);
-
-       break;
-    }
-  }
-
-  fclose(file);
-
-  if (tape.no_valid_file)
-    return;
-
-  tape.length_seconds = GetTapeLength();
-}
-
-#endif
-
-#if 1
-
-void LoadTapeFromFilename(char *filename)
-{
-  char cookie[MAX_LINE_LEN];
-  char chunk_name[CHUNK_ID_LEN + 1];
-  File *file;
-  int chunk_size;
-
-  /* always start with reliable default values */
-  setTapeInfoToDefaults();
-
-  if (strSuffix(filename, ".sln"))
-  {
-    LoadTape_SokobanSolution(filename);
-
-    return;
-  }
-
-  if (!(file = openFile(filename, MODE_READ)))
-  {
-    tape.no_valid_file = TRUE;
-
-    return;
-  }
-
-  getFileChunkBE(file, chunk_name, NULL);
-  if (strEqual(chunk_name, "RND1"))
-  {
-    getFile32BitBE(file);              /* not used */
-
-    getFileChunkBE(file, chunk_name, NULL);
-    if (!strEqual(chunk_name, "TAPE"))
-    {
-      tape.no_valid_file = TRUE;
-
-      Error(ERR_WARN, "unknown format of tape file '%s'", filename);
-
-      closeFile(file);
-
-      return;
-    }
-  }
-  else /* check for pre-2.0 file format with cookie string */
-  {
-    strcpy(cookie, chunk_name);
-    if (getStringFromFile(file, &cookie[4], MAX_LINE_LEN - 4) == NULL)
-      cookie[4] = '\0';
-    if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
-      cookie[strlen(cookie) - 1] = '\0';
-
-    if (!checkCookieString(cookie, TAPE_COOKIE_TMPL))
-    {
-      tape.no_valid_file = TRUE;
-
-      Error(ERR_WARN, "unknown format of tape file '%s'", filename);
-
-      closeFile(file);
+  while (!checkEndOfFile(file))
+  {
+    unsigned char c = getByteFromFile(file);
 
-      return;
-    }
+    if (checkEndOfFile(file))
+      break;
 
-    if ((tape.file_version = getFileVersionFromCookieString(cookie)) == -1)
+    switch (c)
     {
-      tape.no_valid_file = TRUE;
-
-      Error(ERR_WARN, "unsupported version of tape file '%s'", filename);
-
-      closeFile(file);
+      case 'u':
+      case 'U':
+       tape.pos[tape.length].action[0] = MV_UP;
+       tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0);
+       tape.length++;
+       break;
 
-      return;
-    }
+      case 'd':
+      case 'D':
+       tape.pos[tape.length].action[0] = MV_DOWN;
+       tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0);
+       tape.length++;
+       break;
 
-    /* pre-2.0 tape files have no game version, so use file version here */
-    tape.game_version = tape.file_version;
-  }
+      case 'l':
+      case 'L':
+       tape.pos[tape.length].action[0] = MV_LEFT;
+       tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0);
+       tape.length++;
+       break;
 
-  if (tape.file_version < FILE_VERSION_1_2)
-  {
-    /* tape files from versions before 1.2.0 without chunk structure */
-    LoadTape_HEAD(file, TAPE_CHUNK_HEAD_SIZE, &tape);
-    LoadTape_BODY(file, 2 * tape.length,      &tape);
-  }
-  else
-  {
-    static struct
-    {
-      char *name;
-      int size;
-      int (*loader)(File *, int, struct TapeInfo *);
-    }
-    chunk_info[] =
-    {
-      { "VERS", TAPE_CHUNK_VERS_SIZE,  LoadTape_VERS },
-      { "HEAD", TAPE_CHUNK_HEAD_SIZE,  LoadTape_HEAD },
-      { "INFO", -1,                    LoadTape_INFO },
-      { "BODY", -1,                    LoadTape_BODY },
-      {  NULL,  0,                     NULL }
-    };
+      case 'r':
+      case 'R':
+       tape.pos[tape.length].action[0] = MV_RIGHT;
+       tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0);
+       tape.length++;
+       break;
 
-    while (getFileChunkBE(file, chunk_name, &chunk_size))
-    {
-      int i = 0;
+      case '\n':
+      case '\r':
+      case '\t':
+      case ' ':
+       /* ignore white-space characters */
+       break;
 
-      while (chunk_info[i].name != NULL &&
-            !strEqual(chunk_name, chunk_info[i].name))
-       i++;
+      default:
+       tape.no_valid_file = TRUE;
 
-      if (chunk_info[i].name == NULL)
-      {
-       Error(ERR_WARN, "unknown chunk '%s' in tape file '%s'",
-             chunk_name, filename);
-       ReadUnusedBytesFromFile(file, chunk_size);
-      }
-      else if (chunk_info[i].size != -1 &&
-              chunk_info[i].size != chunk_size)
-      {
-       Error(ERR_WARN, "wrong size (%d) of chunk '%s' in tape file '%s'",
-             chunk_size, chunk_name, filename);
-       ReadUnusedBytesFromFile(file, chunk_size);
-      }
-      else
-      {
-       /* call function to load this tape chunk */
-       int chunk_size_expected =
-         (chunk_info[i].loader)(file, chunk_size, &tape);
+       Error(ERR_WARN, "unsupported Sokoban solution file '%s' ['%d']", filename, c);
 
-       /* the size of some chunks cannot be checked before reading other
-          chunks first (like "HEAD" and "BODY") that contain some header
-          information, so check them here */
-       if (chunk_size_expected != chunk_size)
-       {
-         Error(ERR_WARN, "wrong size (%d) of chunk '%s' in tape file '%s'",
-               chunk_size, chunk_name, filename);
-       }
-      }
+       break;
     }
   }
 
   closeFile(file);
 
-  tape.length_seconds = GetTapeLength();
+  if (tape.no_valid_file)
+    return;
 
-#if 0
-  printf("::: tape file version: %d\n", tape.file_version);
-  printf("::: tape game version: %d\n", tape.game_version);
-  printf("::: tape engine version: %d\n", tape.engine_version);
-#endif
+  tape.length_frames  = GetTapeLengthFrames();
+  tape.length_seconds = GetTapeLengthSeconds();
 }
 
-#else
-
 void LoadTapeFromFilename(char *filename)
 {
   char cookie[MAX_LINE_LEN];
   char chunk_name[CHUNK_ID_LEN + 1];
-  FILE *file;
+  File *file;
   int chunk_size;
 
   /* always start with reliable default values */
@@ -10886,7 +7858,7 @@ void LoadTapeFromFilename(char *filename)
     return;
   }
 
-  if (!(file = fopen(filename, MODE_READ)))
+  if (!(file = openFile(filename, MODE_READ)))
   {
     tape.no_valid_file = TRUE;
 
@@ -10904,14 +7876,16 @@ void LoadTapeFromFilename(char *filename)
       tape.no_valid_file = TRUE;
 
       Error(ERR_WARN, "unknown format of tape file '%s'", filename);
-      fclose(file);
+
+      closeFile(file);
+
       return;
     }
   }
   else /* check for pre-2.0 file format with cookie string */
   {
     strcpy(cookie, chunk_name);
-    if (fgets(&cookie[4], MAX_LINE_LEN - 4, file) == NULL)
+    if (getStringFromFile(file, &cookie[4], MAX_LINE_LEN - 4) == NULL)
       cookie[4] = '\0';
     if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
       cookie[strlen(cookie) - 1] = '\0';
@@ -10921,7 +7895,9 @@ void LoadTapeFromFilename(char *filename)
       tape.no_valid_file = TRUE;
 
       Error(ERR_WARN, "unknown format of tape file '%s'", filename);
-      fclose(file);
+
+      closeFile(file);
+
       return;
     }
 
@@ -10930,7 +7906,8 @@ void LoadTapeFromFilename(char *filename)
       tape.no_valid_file = TRUE;
 
       Error(ERR_WARN, "unsupported version of tape file '%s'", filename);
-      fclose(file);
+
+      closeFile(file);
 
       return;
     }
@@ -11001,19 +7978,18 @@ void LoadTapeFromFilename(char *filename)
     }
   }
 
-  fclose(file);
+  closeFile(file);
 
-  tape.length_seconds = GetTapeLength();
+  tape.length_frames  = GetTapeLengthFrames();
+  tape.length_seconds = GetTapeLengthSeconds();
 
 #if 0
-  printf("::: tape file version: %d\n", tape.file_version);
-  printf("::: tape game version: %d\n", tape.game_version);
+  printf("::: tape file version: %d\n",   tape.file_version);
+  printf("::: tape game version: %d\n",   tape.game_version);
   printf("::: tape engine version: %d\n", tape.engine_version);
 #endif
 }
 
-#endif
-
 void LoadTape(int nr)
 {
   char *filename = getTapeFilename(nr);
@@ -11027,12 +8003,10 @@ void LoadSolutionTape(int nr)
 
   LoadTapeFromFilename(filename);
 
-#if 1
   if (TAPE_IS_EMPTY(tape) &&
       level.game_engine_type == GAME_ENGINE_TYPE_SP &&
       level.native_sp_level->demo.is_available)
     CopyNativeTape_SP_to_RND(&level);
-#endif
 }
 
 static void SaveTape_VERS(FILE *file, struct TapeInfo *tape)
@@ -11057,6 +8031,8 @@ static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape)
 
   putFile8Bit(file, store_participating_players);
 
+  putFile8Bit(file, (tape->use_mouse ? 1 : 0));
+
   /* unused bytes not at the end here for 4-byte alignment of engine_version */
   WriteUnusedBytesToFile(file, TAPE_CHUNK_HEAD_UNUSED);
 
@@ -11082,9 +8058,18 @@ static void SaveTape_BODY(FILE *file, struct TapeInfo *tape)
 
   for (i = 0; i < tape->length; i++)
   {
-    for (j = 0; j < MAX_PLAYERS; j++)
-      if (tape->player_participates[j])
-       putFile8Bit(file, tape->pos[i].action[j]);
+    if (tape->use_mouse)
+    {
+      putFile8Bit(file, tape->pos[i].action[TAPE_ACTION_LX]);
+      putFile8Bit(file, tape->pos[i].action[TAPE_ACTION_LY]);
+      putFile8Bit(file, tape->pos[i].action[TAPE_ACTION_BUTTON]);
+    }
+    else
+    {
+      for (j = 0; j < MAX_PLAYERS; j++)
+       if (tape->player_participates[j])
+         putFile8Bit(file, tape->pos[i].action[j]);
+    }
 
     putFile8Bit(file, tape->pos[i].delay);
   }
@@ -11094,26 +8079,14 @@ void SaveTape(int nr)
 {
   char *filename = getTapeFilename(nr);
   FILE *file;
-#if 0
-  boolean new_tape = TRUE;
-#endif
   int num_participating_players = 0;
+  int tape_pos_size;
   int info_chunk_size;
   int body_chunk_size;
   int i;
 
   InitTapeDirectory(leveldir_current->subdir);
 
-#if 0
-  /* if a tape still exists, ask to overwrite it */
-  if (fileExists(filename))
-  {
-    new_tape = FALSE;
-    if (!Request("Replace old tape?", REQ_ASK))
-      return;
-  }
-#endif
-
   if (!(file = fopen(filename, MODE_WRITE)))
   {
     Error(ERR_WARN, "cannot save level recording file '%s'", filename);
@@ -11128,8 +8101,10 @@ void SaveTape(int nr)
     if (tape.player_participates[i])
       num_participating_players++;
 
+  tape_pos_size = (tape.use_mouse ? 3 : num_participating_players) + 1;
+
   info_chunk_size = 2 + (strlen(tape.level_identifier) + 1) + 2;
-  body_chunk_size = (num_participating_players + 1) * tape.length;
+  body_chunk_size = tape_pos_size * tape.length;
 
   putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED);
   putFileChunkBE(file, "TAPE", CHUNK_SIZE_NONE);
@@ -11151,25 +8126,20 @@ void SaveTape(int nr)
   SetFilePermissions(filename, PERMS_PRIVATE);
 
   tape.changed = FALSE;
-
-#if 0
-  if (new_tape)
-    Request("Tape saved!", REQ_CONFIRM);
-#endif
 }
 
-boolean SaveTapeChecked(int nr)
+static boolean SaveTapeCheckedExt(int nr, char *msg_replace, char *msg_saved)
 {
   char *filename = getTapeFilename(nr);
   boolean new_tape = !fileExists(filename);
   boolean tape_saved = FALSE;
 
-  if (new_tape || Request("Replace old tape?", REQ_ASK))
+  if (new_tape || Request(msg_replace, REQ_ASK))
   {
     SaveTape(nr);
 
     if (new_tape)
-      Request("Tape saved!", REQ_CONFIRM);
+      Request(msg_saved, REQ_CONFIRM);
 
     tape_saved = TRUE;
   }
@@ -11177,6 +8147,17 @@ boolean SaveTapeChecked(int nr)
   return tape_saved;
 }
 
+boolean SaveTapeChecked(int nr)
+{
+  return SaveTapeCheckedExt(nr, "Replace old tape?", "Tape saved!");
+}
+
+boolean SaveTapeChecked_LevelSolved(int nr)
+{
+  return SaveTapeCheckedExt(nr, "Level solved! Replace old tape?",
+                               "Level solved! Tape saved!");
+}
+
 void DumpTape(struct TapeInfo *tape)
 {
   int tape_frame_counter;
@@ -11189,13 +8170,13 @@ void DumpTape(struct TapeInfo *tape)
     return;
   }
 
-  printf_line("-", 79);
-  printf("Tape of Level %03d (file version %08d, game version %08d)\n",
-        tape->level_nr, tape->file_version, tape->game_version);
-  printf("                  (effective engine version %08d)\n",
-        tape->engine_version);
-  printf("Level series identifier: '%s'\n", tape->level_identifier);
-  printf_line("-", 79);
+  PrintLine("-", 79);
+  Print("Tape of Level %03d (file version %08d, game version %08d)\n",
+       tape->level_nr, tape->file_version, tape->game_version);
+  Print("                  (effective engine version %08d)\n",
+       tape->engine_version);
+  Print("Level series identifier: '%s'\n", tape->level_identifier);
+  PrintLine("-", 79);
 
   tape_frame_counter = 0;
 
@@ -11204,7 +8185,7 @@ void DumpTape(struct TapeInfo *tape)
     if (i >= MAX_TAPE_LEN)
       break;
 
-    printf("%04d: ", i);
+    Print("%04d: ", i);
 
     for (j = 0; j < MAX_PLAYERS; j++)
     {
@@ -11212,24 +8193,24 @@ void DumpTape(struct TapeInfo *tape)
       {
        int action = tape->pos[i].action[j];
 
-       printf("%d:%02x ", j, action);
-       printf("[%c%c%c%c|%c%c] - ",
-              (action & JOY_LEFT ? '<' : ' '),
-              (action & JOY_RIGHT ? '>' : ' '),
-              (action & JOY_UP ? '^' : ' '),
-              (action & JOY_DOWN ? 'v' : ' '),
-              (action & JOY_BUTTON_1 ? '1' : ' '),
-              (action & JOY_BUTTON_2 ? '2' : ' '));
+       Print("%d:%02x ", j, action);
+       Print("[%c%c%c%c|%c%c] - ",
+             (action & JOY_LEFT ? '<' : ' '),
+             (action & JOY_RIGHT ? '>' : ' '),
+             (action & JOY_UP ? '^' : ' '),
+             (action & JOY_DOWN ? 'v' : ' '),
+             (action & JOY_BUTTON_1 ? '1' : ' '),
+             (action & JOY_BUTTON_2 ? '2' : ' '));
       }
     }
 
-    printf("(%03d) ", tape->pos[i].delay);
-    printf("[%05d]\n", tape_frame_counter);
+    Print("(%03d) ", tape->pos[i].delay);
+    Print("[%05d]\n", tape_frame_counter);
 
     tape_frame_counter += tape->pos[i].delay;
   }
 
-  printf_line("-", 79);
+  PrintLine("-", 79);
 }
 
 
@@ -11296,10 +8277,12 @@ void LoadScore(int nr)
 void SaveScore(int nr)
 {
   int i;
+  int permissions = (program.global_scores ? PERMS_PUBLIC : PERMS_PRIVATE);
   char *filename = getScoreFilename(nr);
   FILE *file;
 
-  InitScoreDirectory(leveldir_current->subdir);
+  /* used instead of "leveldir_current->subdir" (for network games) */
+  InitScoreDirectory(levelset.identifier);
 
   if (!(file = fopen(filename, MODE_WRITE)))
   {
@@ -11314,7 +8297,7 @@ void SaveScore(int nr)
 
   fclose(file);
 
-  SetFilePermissions(filename, PERMS_PUBLIC);
+  SetFilePermissions(filename, permissions);
 }
 
 
@@ -11325,154 +8308,245 @@ void SaveScore(int nr)
 #define TOKEN_STR_PLAYER_PREFIX                        "player_"
 
 /* global setup */
-#define SETUP_TOKEN_PLAYER_NAME                        0
-#define SETUP_TOKEN_SOUND                      1
-#define SETUP_TOKEN_SOUND_LOOPS                        2
-#define SETUP_TOKEN_SOUND_MUSIC                        3
-#define SETUP_TOKEN_SOUND_SIMPLE               4
-#define SETUP_TOKEN_TOONS                      5
-#define SETUP_TOKEN_SCROLL_DELAY               6
-#define SETUP_TOKEN_SCROLL_DELAY_VALUE         7
-#define SETUP_TOKEN_SOFT_SCROLLING             8
-#define SETUP_TOKEN_FADE_SCREENS               9
-#define SETUP_TOKEN_AUTORECORD                 10
-#define SETUP_TOKEN_SHOW_TITLESCREEN           11
-#define SETUP_TOKEN_QUICK_DOORS                        12
-#define SETUP_TOKEN_TEAM_MODE                  13
-#define SETUP_TOKEN_HANDICAP                   14
-#define SETUP_TOKEN_SKIP_LEVELS                        15
-#define SETUP_TOKEN_TIME_LIMIT                 16
-#define SETUP_TOKEN_FULLSCREEN                 17
-#define SETUP_TOKEN_FULLSCREEN_MODE            18
-#define SETUP_TOKEN_WINDOW_SCALING_PERCENT     19
-#define SETUP_TOKEN_WINDOW_SCALING_QUALITY     20
-#define SETUP_TOKEN_ASK_ON_ESCAPE              21
-#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR       22
-#define SETUP_TOKEN_QUICK_SWITCH               23
-#define SETUP_TOKEN_INPUT_ON_FOCUS             24
-#define SETUP_TOKEN_PREFER_AGA_GRAPHICS                25
-#define SETUP_TOKEN_GAME_FRAME_DELAY           26
-#define SETUP_TOKEN_SP_SHOW_BORDER_ELEMENTS    27
-#define SETUP_TOKEN_SMALL_GAME_GRAPHICS                28
-#define SETUP_TOKEN_GRAPHICS_SET               29
-#define SETUP_TOKEN_SOUNDS_SET                 30
-#define SETUP_TOKEN_MUSIC_SET                  31
-#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS    32
-#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS      33
-#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC       34
-#define SETUP_TOKEN_VOLUME_SIMPLE              35
-#define SETUP_TOKEN_VOLUME_LOOPS               36
-#define SETUP_TOKEN_VOLUME_MUSIC               37
-#define SETUP_TOKEN_TOUCH_CONTROL_TYPE         38
-#define SETUP_TOKEN_TOUCH_MOVE_DISTANCE                39
-#define SETUP_TOKEN_TOUCH_DROP_DISTANCE                40
-
-#define NUM_GLOBAL_SETUP_TOKENS                        41
+enum
+{
+  SETUP_TOKEN_PLAYER_NAME = 0,
+  SETUP_TOKEN_SOUND,
+  SETUP_TOKEN_SOUND_LOOPS,
+  SETUP_TOKEN_SOUND_MUSIC,
+  SETUP_TOKEN_SOUND_SIMPLE,
+  SETUP_TOKEN_TOONS,
+  SETUP_TOKEN_SCROLL_DELAY,
+  SETUP_TOKEN_SCROLL_DELAY_VALUE,
+  SETUP_TOKEN_ENGINE_SNAPSHOT_MODE,
+  SETUP_TOKEN_ENGINE_SNAPSHOT_MEMORY,
+  SETUP_TOKEN_FADE_SCREENS,
+  SETUP_TOKEN_AUTORECORD,
+  SETUP_TOKEN_SHOW_TITLESCREEN,
+  SETUP_TOKEN_QUICK_DOORS,
+  SETUP_TOKEN_TEAM_MODE,
+  SETUP_TOKEN_HANDICAP,
+  SETUP_TOKEN_SKIP_LEVELS,
+  SETUP_TOKEN_INCREMENT_LEVELS,
+  SETUP_TOKEN_AUTO_PLAY_NEXT_LEVEL,
+  SETUP_TOKEN_SKIP_SCORES_AFTER_GAME,
+  SETUP_TOKEN_TIME_LIMIT,
+  SETUP_TOKEN_FULLSCREEN,
+  SETUP_TOKEN_WINDOW_SCALING_PERCENT,
+  SETUP_TOKEN_WINDOW_SCALING_QUALITY,
+  SETUP_TOKEN_SCREEN_RENDERING_MODE,
+  SETUP_TOKEN_ASK_ON_ESCAPE,
+  SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR,
+  SETUP_TOKEN_QUICK_SWITCH,
+  SETUP_TOKEN_INPUT_ON_FOCUS,
+  SETUP_TOKEN_PREFER_AGA_GRAPHICS,
+  SETUP_TOKEN_GAME_FRAME_DELAY,
+  SETUP_TOKEN_SP_SHOW_BORDER_ELEMENTS,
+  SETUP_TOKEN_SMALL_GAME_GRAPHICS,
+  SETUP_TOKEN_SHOW_SNAPSHOT_BUTTONS,
+  SETUP_TOKEN_GRAPHICS_SET,
+  SETUP_TOKEN_SOUNDS_SET,
+  SETUP_TOKEN_MUSIC_SET,
+  SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS,
+  SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS,
+  SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC,
+  SETUP_TOKEN_VOLUME_SIMPLE,
+  SETUP_TOKEN_VOLUME_LOOPS,
+  SETUP_TOKEN_VOLUME_MUSIC,
+  SETUP_TOKEN_NETWORK_MODE,
+  SETUP_TOKEN_NETWORK_PLAYER_NR,
+  SETUP_TOKEN_TOUCH_CONTROL_TYPE,
+  SETUP_TOKEN_TOUCH_MOVE_DISTANCE,
+  SETUP_TOKEN_TOUCH_DROP_DISTANCE,
+  SETUP_TOKEN_TOUCH_TRANSPARENCY,
+  SETUP_TOKEN_TOUCH_DRAW_OUTLINED,
+  SETUP_TOKEN_TOUCH_DRAW_PRESSED,
+  SETUP_TOKEN_TOUCH_GRID_XSIZE_0,
+  SETUP_TOKEN_TOUCH_GRID_YSIZE_0,
+  SETUP_TOKEN_TOUCH_GRID_XSIZE_1,
+  SETUP_TOKEN_TOUCH_GRID_YSIZE_1,
+
+  NUM_GLOBAL_SETUP_TOKENS
+};
+
+/* auto setup */
+enum
+{
+  SETUP_TOKEN_AUTO_EDITOR_ZOOM_TILESIZE = 0,
+
+  NUM_AUTO_SETUP_TOKENS
+};
 
 /* editor setup */
-#define SETUP_TOKEN_EDITOR_EL_BOULDERDASH      0
-#define SETUP_TOKEN_EDITOR_EL_EMERALD_MINE     1
-#define SETUP_TOKEN_EDITOR_EL_EMERALD_MINE_CLUB        2
-#define SETUP_TOKEN_EDITOR_EL_MORE             3
-#define SETUP_TOKEN_EDITOR_EL_SOKOBAN          4
-#define SETUP_TOKEN_EDITOR_EL_SUPAPLEX         5
-#define SETUP_TOKEN_EDITOR_EL_DIAMOND_CAVES    6
-#define SETUP_TOKEN_EDITOR_EL_DX_BOULDERDASH   7
-#define SETUP_TOKEN_EDITOR_EL_CHARS            8
-#define SETUP_TOKEN_EDITOR_EL_STEEL_CHARS      9
-#define SETUP_TOKEN_EDITOR_EL_CUSTOM           10
-#define SETUP_TOKEN_EDITOR_EL_HEADLINES                11
-#define SETUP_TOKEN_EDITOR_EL_USER_DEFINED     12
-#define SETUP_TOKEN_EDITOR_EL_DYNAMIC          13
-#define SETUP_TOKEN_EDITOR_EL_BY_GAME          14
-#define SETUP_TOKEN_EDITOR_EL_BY_TYPE          15
-#define SETUP_TOKEN_EDITOR_SHOW_ELEMENT_TOKEN  16
-
-#define NUM_EDITOR_SETUP_TOKENS                        17
+enum
+{
+  SETUP_TOKEN_EDITOR_EL_CLASSIC = 0,
+  SETUP_TOKEN_EDITOR_EL_CUSTOM,
+  SETUP_TOKEN_EDITOR_EL_USER_DEFINED,
+  SETUP_TOKEN_EDITOR_EL_DYNAMIC,
+  SETUP_TOKEN_EDITOR_EL_HEADLINES,
+  SETUP_TOKEN_EDITOR_SHOW_ELEMENT_TOKEN,
+
+  NUM_EDITOR_SETUP_TOKENS
+};
 
 /* editor cascade setup */
-#define SETUP_TOKEN_EDITOR_CASCADE_BD          0
-#define SETUP_TOKEN_EDITOR_CASCADE_EM          1
-#define SETUP_TOKEN_EDITOR_CASCADE_EMC         2
-#define SETUP_TOKEN_EDITOR_CASCADE_RND         3
-#define SETUP_TOKEN_EDITOR_CASCADE_SB          4
-#define SETUP_TOKEN_EDITOR_CASCADE_SP          5
-#define SETUP_TOKEN_EDITOR_CASCADE_DC          6
-#define SETUP_TOKEN_EDITOR_CASCADE_DX          7
-#define SETUP_TOKEN_EDITOR_CASCADE_TEXT                8
-#define SETUP_TOKEN_EDITOR_CASCADE_STEELTEXT   9
-#define SETUP_TOKEN_EDITOR_CASCADE_CE          10
-#define SETUP_TOKEN_EDITOR_CASCADE_GE          11
-#define SETUP_TOKEN_EDITOR_CASCADE_REF         12
-#define SETUP_TOKEN_EDITOR_CASCADE_USER                13
-#define SETUP_TOKEN_EDITOR_CASCADE_DYNAMIC     14
-
-#define NUM_EDITOR_CASCADE_SETUP_TOKENS                15
+enum
+{
+  SETUP_TOKEN_EDITOR_CASCADE_BD = 0,
+  SETUP_TOKEN_EDITOR_CASCADE_EM,
+  SETUP_TOKEN_EDITOR_CASCADE_EMC,
+  SETUP_TOKEN_EDITOR_CASCADE_RND,
+  SETUP_TOKEN_EDITOR_CASCADE_SB,
+  SETUP_TOKEN_EDITOR_CASCADE_SP,
+  SETUP_TOKEN_EDITOR_CASCADE_DC,
+  SETUP_TOKEN_EDITOR_CASCADE_DX,
+  SETUP_TOKEN_EDITOR_CASCADE_TEXT,
+  SETUP_TOKEN_EDITOR_CASCADE_STEELTEXT,
+  SETUP_TOKEN_EDITOR_CASCADE_CE,
+  SETUP_TOKEN_EDITOR_CASCADE_GE,
+  SETUP_TOKEN_EDITOR_CASCADE_REF,
+  SETUP_TOKEN_EDITOR_CASCADE_USER,
+  SETUP_TOKEN_EDITOR_CASCADE_DYNAMIC,
+
+  NUM_EDITOR_CASCADE_SETUP_TOKENS
+};
 
 /* shortcut setup */
-#define SETUP_TOKEN_SHORTCUT_SAVE_GAME         0
-#define SETUP_TOKEN_SHORTCUT_LOAD_GAME         1
-#define SETUP_TOKEN_SHORTCUT_TOGGLE_PAUSE      2
-#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_1    3
-#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_2    4
-#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_3    5
-#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_4    6
-#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_ALL  7
-#define SETUP_TOKEN_SHORTCUT_TAPE_EJECT                8
-#define SETUP_TOKEN_SHORTCUT_TAPE_EXTRA                9
-#define SETUP_TOKEN_SHORTCUT_TAPE_STOP         10
-#define SETUP_TOKEN_SHORTCUT_TAPE_PAUSE                11
-#define SETUP_TOKEN_SHORTCUT_TAPE_RECORD       12
-#define SETUP_TOKEN_SHORTCUT_TAPE_PLAY         13
-#define SETUP_TOKEN_SHORTCUT_SOUND_SIMPLE      14
-#define SETUP_TOKEN_SHORTCUT_SOUND_LOOPS       15
-#define SETUP_TOKEN_SHORTCUT_SOUND_MUSIC       16
-#define SETUP_TOKEN_SHORTCUT_SNAP_LEFT         17
-#define SETUP_TOKEN_SHORTCUT_SNAP_RIGHT                18
-#define SETUP_TOKEN_SHORTCUT_SNAP_UP           19
-#define SETUP_TOKEN_SHORTCUT_SNAP_DOWN         20
-
-#define NUM_SHORTCUT_SETUP_TOKENS              21
+enum
+{
+  SETUP_TOKEN_SHORTCUT_SAVE_GAME = 0,
+  SETUP_TOKEN_SHORTCUT_LOAD_GAME,
+  SETUP_TOKEN_SHORTCUT_TOGGLE_PAUSE,
+  SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_1,
+  SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_2,
+  SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_3,
+  SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_4,
+  SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_ALL,
+  SETUP_TOKEN_SHORTCUT_TAPE_EJECT,
+  SETUP_TOKEN_SHORTCUT_TAPE_EXTRA,
+  SETUP_TOKEN_SHORTCUT_TAPE_STOP,
+  SETUP_TOKEN_SHORTCUT_TAPE_PAUSE,
+  SETUP_TOKEN_SHORTCUT_TAPE_RECORD,
+  SETUP_TOKEN_SHORTCUT_TAPE_PLAY,
+  SETUP_TOKEN_SHORTCUT_SOUND_SIMPLE,
+  SETUP_TOKEN_SHORTCUT_SOUND_LOOPS,
+  SETUP_TOKEN_SHORTCUT_SOUND_MUSIC,
+  SETUP_TOKEN_SHORTCUT_SNAP_LEFT,
+  SETUP_TOKEN_SHORTCUT_SNAP_RIGHT,
+  SETUP_TOKEN_SHORTCUT_SNAP_UP,
+  SETUP_TOKEN_SHORTCUT_SNAP_DOWN,
+
+  NUM_SHORTCUT_SETUP_TOKENS
+};
 
 /* player setup */
-#define SETUP_TOKEN_PLAYER_USE_JOYSTICK                0
-#define SETUP_TOKEN_PLAYER_JOY_DEVICE_NAME     1
-#define SETUP_TOKEN_PLAYER_JOY_XLEFT           2
-#define SETUP_TOKEN_PLAYER_JOY_XMIDDLE         3
-#define SETUP_TOKEN_PLAYER_JOY_XRIGHT          4
-#define SETUP_TOKEN_PLAYER_JOY_YUPPER          5
-#define SETUP_TOKEN_PLAYER_JOY_YMIDDLE         6
-#define SETUP_TOKEN_PLAYER_JOY_YLOWER          7
-#define SETUP_TOKEN_PLAYER_JOY_SNAP            8
-#define SETUP_TOKEN_PLAYER_JOY_DROP            9
-#define SETUP_TOKEN_PLAYER_KEY_LEFT            10
-#define SETUP_TOKEN_PLAYER_KEY_RIGHT           11
-#define SETUP_TOKEN_PLAYER_KEY_UP              12
-#define SETUP_TOKEN_PLAYER_KEY_DOWN            13
-#define SETUP_TOKEN_PLAYER_KEY_SNAP            14
-#define SETUP_TOKEN_PLAYER_KEY_DROP            15
-
-#define NUM_PLAYER_SETUP_TOKENS                        16
+enum
+{
+  SETUP_TOKEN_PLAYER_USE_JOYSTICK = 0,
+  SETUP_TOKEN_PLAYER_JOY_DEVICE_NAME,
+  SETUP_TOKEN_PLAYER_JOY_XLEFT,
+  SETUP_TOKEN_PLAYER_JOY_XMIDDLE,
+  SETUP_TOKEN_PLAYER_JOY_XRIGHT,
+  SETUP_TOKEN_PLAYER_JOY_YUPPER,
+  SETUP_TOKEN_PLAYER_JOY_YMIDDLE,
+  SETUP_TOKEN_PLAYER_JOY_YLOWER,
+  SETUP_TOKEN_PLAYER_JOY_SNAP,
+  SETUP_TOKEN_PLAYER_JOY_DROP,
+  SETUP_TOKEN_PLAYER_KEY_LEFT,
+  SETUP_TOKEN_PLAYER_KEY_RIGHT,
+  SETUP_TOKEN_PLAYER_KEY_UP,
+  SETUP_TOKEN_PLAYER_KEY_DOWN,
+  SETUP_TOKEN_PLAYER_KEY_SNAP,
+  SETUP_TOKEN_PLAYER_KEY_DROP,
+
+  NUM_PLAYER_SETUP_TOKENS
+};
 
 /* system setup */
-#define SETUP_TOKEN_SYSTEM_SDL_VIDEODRIVER     0
-#define SETUP_TOKEN_SYSTEM_SDL_AUDIODRIVER     1
-#define SETUP_TOKEN_SYSTEM_AUDIO_FRAGMENT_SIZE 2
+enum
+{
+  SETUP_TOKEN_SYSTEM_SDL_VIDEODRIVER = 0,
+  SETUP_TOKEN_SYSTEM_SDL_AUDIODRIVER,
+  SETUP_TOKEN_SYSTEM_AUDIO_FRAGMENT_SIZE,
 
-#define NUM_SYSTEM_SETUP_TOKENS                        3
+  NUM_SYSTEM_SETUP_TOKENS
+};
+
+/* internal setup */
+enum
+{
+  SETUP_TOKEN_INT_PROGRAM_TITLE = 0,
+  SETUP_TOKEN_INT_PROGRAM_VERSION,
+  SETUP_TOKEN_INT_PROGRAM_AUTHOR,
+  SETUP_TOKEN_INT_PROGRAM_EMAIL,
+  SETUP_TOKEN_INT_PROGRAM_WEBSITE,
+  SETUP_TOKEN_INT_PROGRAM_COPYRIGHT,
+  SETUP_TOKEN_INT_PROGRAM_COMPANY,
+  SETUP_TOKEN_INT_PROGRAM_ICON_FILE,
+  SETUP_TOKEN_INT_DEFAULT_GRAPHICS_SET,
+  SETUP_TOKEN_INT_DEFAULT_SOUNDS_SET,
+  SETUP_TOKEN_INT_DEFAULT_MUSIC_SET,
+  SETUP_TOKEN_INT_FALLBACK_GRAPHICS_FILE,
+  SETUP_TOKEN_INT_FALLBACK_SOUNDS_FILE,
+  SETUP_TOKEN_INT_FALLBACK_MUSIC_FILE,
+  SETUP_TOKEN_INT_DEFAULT_LEVEL_SERIES,
+  SETUP_TOKEN_INT_CHOOSE_FROM_TOP_LEVELDIR,
+  SETUP_TOKEN_INT_SHOW_SCALING_IN_TITLE,
+  SETUP_TOKEN_INT_DEFAULT_WINDOW_WIDTH,
+  SETUP_TOKEN_INT_DEFAULT_WINDOW_HEIGHT,
+
+  NUM_INTERNAL_SETUP_TOKENS
+};
+
+/* debug setup */
+enum
+{
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_0 = 0,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_1,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_2,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_3,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_4,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_5,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_6,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_7,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_8,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_9,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_0,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_1,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_2,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_3,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_4,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_5,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_6,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_7,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_8,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_9,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_USE_MOD_KEY,
+  SETUP_TOKEN_DEBUG_FRAME_DELAY_GAME_ONLY,
+  SETUP_TOKEN_DEBUG_SHOW_FRAMES_PER_SECOND,
+
+  NUM_DEBUG_SETUP_TOKENS
+};
 
 /* options setup */
-#define SETUP_TOKEN_OPTIONS_VERBOSE            0
+enum
+{
+  SETUP_TOKEN_OPTIONS_VERBOSE = 0,
 
-#define NUM_OPTIONS_SETUP_TOKENS               1
+  NUM_OPTIONS_SETUP_TOKENS
+};
 
 
 static struct SetupInfo si;
+static struct SetupAutoSetupInfo sasi;
 static struct SetupEditorInfo sei;
 static struct SetupEditorCascadeInfo seci;
 static struct SetupShortcutInfo ssi;
 static struct SetupInputInfo sii;
 static struct SetupSystemInfo syi;
+static struct SetupInternalInfo sxi;
+static struct SetupDebugInfo sdi;
 static struct OptionInfo soi;
 
 static struct TokenInfo global_setup_tokens[] =
@@ -11485,7 +8559,8 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH, &si.toons,                   "toons"                  },
   { TYPE_SWITCH, &si.scroll_delay,            "scroll_delay"           },
   { TYPE_INTEGER,&si.scroll_delay_value,      "scroll_delay_value"     },
-  { TYPE_SWITCH, &si.soft_scrolling,          "soft_scrolling"         },
+  { TYPE_STRING, &si.engine_snapshot_mode,    "engine_snapshot_mode"   },
+  { TYPE_INTEGER,&si.engine_snapshot_memory,  "engine_snapshot_memory" },
   { TYPE_SWITCH, &si.fade_screens,            "fade_screens"           },
   { TYPE_SWITCH, &si.autorecord,              "automatic_tape_recording"},
   { TYPE_SWITCH, &si.show_titlescreen,        "show_titlescreen"       },
@@ -11493,11 +8568,14 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH, &si.team_mode,               "team_mode"              },
   { TYPE_SWITCH, &si.handicap,                "handicap"               },
   { TYPE_SWITCH, &si.skip_levels,             "skip_levels"            },
+  { TYPE_SWITCH, &si.increment_levels,        "increment_levels"       },
+  { TYPE_SWITCH, &si.auto_play_next_level,    "auto_play_next_level"   },
+  { TYPE_SWITCH, &si.skip_scores_after_game,  "skip_scores_after_game" },
   { TYPE_SWITCH, &si.time_limit,              "time_limit"             },
   { TYPE_SWITCH, &si.fullscreen,              "fullscreen"             },
-  { TYPE_STRING, &si.fullscreen_mode,         "fullscreen_mode"                },
   { TYPE_INTEGER,&si.window_scaling_percent,  "window_scaling_percent" },
   { TYPE_STRING, &si.window_scaling_quality,  "window_scaling_quality" },
+  { TYPE_STRING, &si.screen_rendering_mode,   "screen_rendering_mode"  },
   { TYPE_SWITCH, &si.ask_on_escape,           "ask_on_escape"          },
   { TYPE_SWITCH, &si.ask_on_escape_editor,    "ask_on_escape_editor"   },
   { TYPE_SWITCH, &si.quick_switch,            "quick_player_switch"    },
@@ -11506,6 +8584,7 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_INTEGER,&si.game_frame_delay,        "game_frame_delay"       },
   { TYPE_SWITCH, &si.sp_show_border_elements, "sp_show_border_elements"        },
   { TYPE_SWITCH, &si.small_game_graphics,     "small_game_graphics"    },
+  { TYPE_SWITCH, &si.show_snapshot_buttons,   "show_snapshot_buttons"  },
   { TYPE_STRING, &si.graphics_set,            "graphics_set"           },
   { TYPE_STRING, &si.sounds_set,              "sounds_set"             },
   { TYPE_STRING, &si.music_set,               "music_set"              },
@@ -11515,45 +8594,32 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_INTEGER,&si.volume_simple,           "volume_simple"          },
   { TYPE_INTEGER,&si.volume_loops,            "volume_loops"           },
   { TYPE_INTEGER,&si.volume_music,            "volume_music"           },
+  { TYPE_SWITCH, &si.network_mode,            "network_mode"           },
+  { TYPE_PLAYER, &si.network_player_nr,       "network_player"         },
   { TYPE_STRING, &si.touch.control_type,      "touch.control_type"     },
   { TYPE_INTEGER,&si.touch.move_distance,     "touch.move_distance"    },
   { TYPE_INTEGER,&si.touch.drop_distance,     "touch.drop_distance"    },
+  { TYPE_INTEGER,&si.touch.transparency,      "touch.transparency"     },
+  { TYPE_INTEGER,&si.touch.draw_outlined,     "touch.draw_outlined"    },
+  { TYPE_INTEGER,&si.touch.draw_pressed,      "touch.draw_pressed"     },
+  { TYPE_INTEGER,&si.touch.grid_xsize[0],     "touch.virtual_buttons.0.xsize" },
+  { TYPE_INTEGER,&si.touch.grid_ysize[0],     "touch.virtual_buttons.0.ysize" },
+  { TYPE_INTEGER,&si.touch.grid_xsize[1],     "touch.virtual_buttons.1.xsize" },
+  { TYPE_INTEGER,&si.touch.grid_ysize[1],     "touch.virtual_buttons.1.ysize" },
+};
+
+static struct TokenInfo auto_setup_tokens[] =
+{
+  { TYPE_INTEGER,&sasi.editor_zoom_tilesize,   "editor.zoom_tilesize"  },
 };
 
-static boolean not_used = FALSE;
 static struct TokenInfo editor_setup_tokens[] =
 {
-#if 1
-  { TYPE_SWITCH, &not_used,            "editor.el_boulderdash"         },
-  { TYPE_SWITCH, &not_used,            "editor.el_emerald_mine"        },
-  { TYPE_SWITCH, &not_used,            "editor.el_emerald_mine_club"   },
-  { TYPE_SWITCH, &not_used,            "editor.el_more"                },
-  { TYPE_SWITCH, &not_used,            "editor.el_sokoban"             },
-  { TYPE_SWITCH, &not_used,            "editor.el_supaplex"            },
-  { TYPE_SWITCH, &not_used,            "editor.el_diamond_caves"       },
-  { TYPE_SWITCH, &not_used,            "editor.el_dx_boulderdash"      },
-#else
-  { TYPE_SWITCH, &sei.el_boulderdash,  "editor.el_boulderdash"         },
-  { TYPE_SWITCH, &sei.el_emerald_mine, "editor.el_emerald_mine"        },
-  { TYPE_SWITCH, &sei.el_emerald_mine_club,"editor.el_emerald_mine_club"},
-  { TYPE_SWITCH, &sei.el_more,         "editor.el_more"                },
-  { TYPE_SWITCH, &sei.el_sokoban,      "editor.el_sokoban"             },
-  { TYPE_SWITCH, &sei.el_supaplex,     "editor.el_supaplex"            },
-  { TYPE_SWITCH, &sei.el_diamond_caves,        "editor.el_diamond_caves"       },
-  { TYPE_SWITCH, &sei.el_dx_boulderdash,"editor.el_dx_boulderdash"     },
-#endif
-  { TYPE_SWITCH, &sei.el_chars,                "editor.el_chars"               },
-  { TYPE_SWITCH, &sei.el_steel_chars,  "editor.el_steel_chars"         },
+  { TYPE_SWITCH, &sei.el_classic,      "editor.el_classic"             },
   { TYPE_SWITCH, &sei.el_custom,       "editor.el_custom"              },
-#if 1
-  { TYPE_SWITCH, &not_used,            "editor.el_headlines"           },
-#else
-  { TYPE_SWITCH, &sei.el_headlines,    "editor.el_headlines"           },
-#endif
   { TYPE_SWITCH, &sei.el_user_defined, "editor.el_user_defined"        },
   { TYPE_SWITCH, &sei.el_dynamic,      "editor.el_dynamic"             },
-  { TYPE_SWITCH, &sei.el_by_game,      "editor.el_by_game"             },
-  { TYPE_SWITCH, &sei.el_by_type,      "editor.el_by_type"             },
+  { TYPE_SWITCH, &sei.el_headlines,    "editor.el_headlines"           },
   { TYPE_SWITCH, &sei.show_element_token,"editor.show_element_token"   },
 };
 
@@ -11567,6 +8633,8 @@ static struct TokenInfo editor_cascade_setup_tokens[] =
   { TYPE_SWITCH, &seci.el_sp,          "editor.cascade.el_sp"          },
   { TYPE_SWITCH, &seci.el_dc,          "editor.cascade.el_dc"          },
   { TYPE_SWITCH, &seci.el_dx,          "editor.cascade.el_dx"          },
+  { TYPE_SWITCH, &seci.el_mm,          "editor.cascade.el_mm"          },
+  { TYPE_SWITCH, &seci.el_df,          "editor.cascade.el_df"          },
   { TYPE_SWITCH, &seci.el_chars,       "editor.cascade.el_chars"       },
   { TYPE_SWITCH, &seci.el_steel_chars, "editor.cascade.el_steel_chars" },
   { TYPE_SWITCH, &seci.el_ce,          "editor.cascade.el_ce"          },
@@ -11623,11 +8691,61 @@ static struct TokenInfo player_setup_tokens[] =
 
 static struct TokenInfo system_setup_tokens[] =
 {
-  { TYPE_STRING,  &syi.sdl_videodriver,        "system.sdl_videodriver"        },
-  { TYPE_STRING,  &syi.sdl_audiodriver,        "system.sdl_audiodriver"        },
+  { TYPE_STRING,  &syi.sdl_videodriver,    "system.sdl_videodriver"    },
+  { TYPE_STRING,  &syi.sdl_audiodriver,           "system.sdl_audiodriver"     },
   { TYPE_INTEGER, &syi.audio_fragment_size,"system.audio_fragment_size"        },
 };
 
+static struct TokenInfo internal_setup_tokens[] =
+{
+  { TYPE_STRING, &sxi.program_title,           "program_title"         },
+  { TYPE_STRING, &sxi.program_version,         "program_version"       },
+  { TYPE_STRING, &sxi.program_author,          "program_author"        },
+  { TYPE_STRING, &sxi.program_email,           "program_email"         },
+  { TYPE_STRING, &sxi.program_website,         "program_website"       },
+  { TYPE_STRING, &sxi.program_copyright,       "program_copyright"     },
+  { TYPE_STRING, &sxi.program_company,         "program_company"       },
+  { TYPE_STRING, &sxi.program_icon_file,       "program_icon_file"     },
+  { TYPE_STRING, &sxi.default_graphics_set,    "default_graphics_set"  },
+  { TYPE_STRING, &sxi.default_sounds_set,      "default_sounds_set"    },
+  { TYPE_STRING, &sxi.default_music_set,       "default_music_set"     },
+  { TYPE_STRING, &sxi.fallback_graphics_file,  "fallback_graphics_file"},
+  { TYPE_STRING, &sxi.fallback_sounds_file,    "fallback_sounds_file"  },
+  { TYPE_STRING, &sxi.fallback_music_file,     "fallback_music_file"   },
+  { TYPE_STRING, &sxi.default_level_series,    "default_level_series"  },
+  { TYPE_BOOLEAN,&sxi.choose_from_top_leveldir,        "choose_from_top_leveldir" },
+  { TYPE_BOOLEAN,&sxi.show_scaling_in_title,   "show_scaling_in_title" },
+  { TYPE_INTEGER,&sxi.default_window_width,    "default_window_width"  },
+  { TYPE_INTEGER,&sxi.default_window_height,   "default_window_height" },
+};
+
+static struct TokenInfo debug_setup_tokens[] =
+{
+  { TYPE_INTEGER, &sdi.frame_delay[0],         "debug.frame_delay_0"   },
+  { TYPE_INTEGER, &sdi.frame_delay[1],         "debug.frame_delay_1"   },
+  { TYPE_INTEGER, &sdi.frame_delay[2],         "debug.frame_delay_2"   },
+  { TYPE_INTEGER, &sdi.frame_delay[3],         "debug.frame_delay_3"   },
+  { TYPE_INTEGER, &sdi.frame_delay[4],         "debug.frame_delay_4"   },
+  { TYPE_INTEGER, &sdi.frame_delay[5],         "debug.frame_delay_5"   },
+  { TYPE_INTEGER, &sdi.frame_delay[6],         "debug.frame_delay_6"   },
+  { TYPE_INTEGER, &sdi.frame_delay[7],         "debug.frame_delay_7"   },
+  { TYPE_INTEGER, &sdi.frame_delay[8],         "debug.frame_delay_8"   },
+  { TYPE_INTEGER, &sdi.frame_delay[9],         "debug.frame_delay_9"   },
+  { TYPE_KEY_X11, &sdi.frame_delay_key[0],     "debug.key.frame_delay_0" },
+  { TYPE_KEY_X11, &sdi.frame_delay_key[1],     "debug.key.frame_delay_1" },
+  { TYPE_KEY_X11, &sdi.frame_delay_key[2],     "debug.key.frame_delay_2" },
+  { TYPE_KEY_X11, &sdi.frame_delay_key[3],     "debug.key.frame_delay_3" },
+  { TYPE_KEY_X11, &sdi.frame_delay_key[4],     "debug.key.frame_delay_4" },
+  { TYPE_KEY_X11, &sdi.frame_delay_key[5],     "debug.key.frame_delay_5" },
+  { TYPE_KEY_X11, &sdi.frame_delay_key[6],     "debug.key.frame_delay_6" },
+  { TYPE_KEY_X11, &sdi.frame_delay_key[7],     "debug.key.frame_delay_7" },
+  { TYPE_KEY_X11, &sdi.frame_delay_key[8],     "debug.key.frame_delay_8" },
+  { TYPE_KEY_X11, &sdi.frame_delay_key[9],     "debug.key.frame_delay_9" },
+  { TYPE_BOOLEAN, &sdi.frame_delay_use_mod_key,"debug.frame_delay.use_mod_key"},
+  { TYPE_BOOLEAN, &sdi.frame_delay_game_only,  "debug.frame_delay.game_only" },
+  { TYPE_BOOLEAN, &sdi.show_frames_per_second, "debug.show_frames_per_second" },
+};
+
 static struct TokenInfo options_setup_tokens[] =
 {
   { TYPE_BOOLEAN, &soi.verbose,                "options.verbose"               },
@@ -11661,7 +8779,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->toons = TRUE;
   si->scroll_delay = TRUE;
   si->scroll_delay_value = STD_SCROLL_DELAY;
-  si->soft_scrolling = TRUE;
+  si->engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_DEFAULT);
+  si->engine_snapshot_memory = SNAPSHOT_MEMORY_DEFAULT;
   si->fade_screens = TRUE;
   si->autorecord = TRUE;
   si->show_titlescreen = TRUE;
@@ -11669,11 +8788,14 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->team_mode = FALSE;
   si->handicap = TRUE;
   si->skip_levels = TRUE;
+  si->increment_levels = TRUE;
+  si->auto_play_next_level = TRUE;
+  si->skip_scores_after_game = FALSE;
   si->time_limit = TRUE;
   si->fullscreen = FALSE;
-  si->fullscreen_mode = getStringCopy(DEFAULT_FULLSCREEN_MODE);
   si->window_scaling_percent = STD_WINDOW_SCALING_PERCENT;
   si->window_scaling_quality = getStringCopy(SCALING_QUALITY_DEFAULT);
+  si->screen_rendering_mode = getStringCopy(STR_SPECIAL_RENDERING_DEFAULT);
   si->ask_on_escape = TRUE;
   si->ask_on_escape_editor = TRUE;
   si->quick_switch = FALSE;
@@ -11682,10 +8804,12 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->game_frame_delay = GAME_FRAME_DELAY;
   si->sp_show_border_elements = FALSE;
   si->small_game_graphics = FALSE;
+  si->show_snapshot_buttons = FALSE;
+
+  si->graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR);
+  si->sounds_set   = getStringCopy(SND_CLASSIC_SUBDIR);
+  si->music_set    = getStringCopy(MUS_CLASSIC_SUBDIR);
 
-  si->graphics_set = getStringCopy(GFX_DEFAULT_SUBDIR);
-  si->sounds_set = getStringCopy(SND_DEFAULT_SUBDIR);
-  si->music_set = getStringCopy(MUS_DEFAULT_SUBDIR);
   si->override_level_graphics = FALSE;
   si->override_level_sounds = FALSE;
   si->override_level_music = FALSE;
@@ -11694,9 +8818,64 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->volume_loops = 100;              /* percent */
   si->volume_music = 100;              /* percent */
 
+  si->network_mode = FALSE;
+  si->network_player_nr = 0;           /* first player */
+
   si->touch.control_type = getStringCopy(TOUCH_CONTROL_DEFAULT);
   si->touch.move_distance = TOUCH_MOVE_DISTANCE_DEFAULT;       /* percent */
   si->touch.drop_distance = TOUCH_DROP_DISTANCE_DEFAULT;       /* percent */
+  si->touch.transparency = TOUCH_TRANSPARENCY_DEFAULT;         /* percent */
+  si->touch.draw_outlined = TRUE;
+  si->touch.draw_pressed = TRUE;
+
+  for (i = 0; i < 2; i++)
+  {
+    char *default_grid_button[6][2] =
+    {
+      { "      ", "  ^^  " },
+      { "      ", "  ^^  " },
+      { "      ", "<<  >>" },
+      { "      ", "<<  >>" },
+      { "111222", "  vv  " },
+      { "111222", "  vv  " }
+    };
+    int grid_xsize = DEFAULT_GRID_XSIZE(i);
+    int grid_ysize = DEFAULT_GRID_YSIZE(i);
+    int min_xsize = MIN(6, grid_xsize);
+    int min_ysize = MIN(6, grid_ysize);
+    int startx = grid_xsize - min_xsize;
+    int starty = grid_ysize - min_ysize;
+    int x, y;
+
+    // virtual buttons grid can only be set to defaults if video is initialized
+    // (this will be repeated if virtual buttons are not loaded from setup file)
+    if (video.initialized)
+    {
+      si->touch.grid_xsize[i] = grid_xsize;
+      si->touch.grid_ysize[i] = grid_ysize;
+    }
+    else
+    {
+      si->touch.grid_xsize[i] = -1;
+      si->touch.grid_ysize[i] = -1;
+    }
+
+    for (x = 0; x < MAX_GRID_XSIZE; x++)
+      for (y = 0; y < MAX_GRID_YSIZE; y++)
+       si->touch.grid_button[i][x][y] = CHAR_GRID_BUTTON_NONE;
+
+    for (x = 0; x < min_xsize; x++)
+      for (y = 0; y < min_ysize; y++)
+       si->touch.grid_button[i][x][starty + y] =
+         default_grid_button[y][0][x];
+
+    for (x = 0; x < min_xsize; x++)
+      for (y = 0; y < min_ysize; y++)
+       si->touch.grid_button[i][startx + x][starty + y] =
+         default_grid_button[y][1][x];
+  }
+
+  si->touch.grid_initialized           = video.initialized;
 
   si->editor.el_boulderdash            = TRUE;
   si->editor.el_emerald_mine           = TRUE;
@@ -11706,15 +8885,24 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->editor.el_supaplex               = TRUE;
   si->editor.el_diamond_caves          = TRUE;
   si->editor.el_dx_boulderdash         = TRUE;
+
+  si->editor.el_mirror_magic           = TRUE;
+  si->editor.el_deflektor              = TRUE;
+
   si->editor.el_chars                  = TRUE;
   si->editor.el_steel_chars            = TRUE;
+
+  si->editor.el_classic                        = TRUE;
   si->editor.el_custom                 = TRUE;
 
-  si->editor.el_headlines = TRUE;
-  si->editor.el_user_defined = FALSE;
-  si->editor.el_dynamic = TRUE;
+  si->editor.el_user_defined           = FALSE;
+  si->editor.el_dynamic                        = TRUE;
+
+  si->editor.el_headlines              = TRUE;
+
+  si->editor.show_element_token                = FALSE;
 
-  si->editor.show_element_token = FALSE;
+  si->editor.use_template_for_new_levels = TRUE;
 
   si->shortcut.save_game       = DEFAULT_KEY_SAVE_GAME;
   si->shortcut.load_game       = DEFAULT_KEY_LOAD_GAME;
@@ -11766,22 +8954,70 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->system.sdl_audiodriver = getStringCopy(ARG_DEFAULT);
   si->system.audio_fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
 
-  si->options.verbose = FALSE;
+  si->internal.program_title     = getStringCopy(PROGRAM_TITLE_STRING);
+  si->internal.program_version   = getStringCopy(getProgramRealVersionString());
+  si->internal.program_author    = getStringCopy(PROGRAM_AUTHOR_STRING);
+  si->internal.program_email     = getStringCopy(PROGRAM_EMAIL_STRING);
+  si->internal.program_website   = getStringCopy(PROGRAM_WEBSITE_STRING);
+  si->internal.program_copyright = getStringCopy(PROGRAM_COPYRIGHT_STRING);
+  si->internal.program_company   = getStringCopy(PROGRAM_COMPANY_STRING);
+
+  si->internal.program_icon_file = getStringCopy(PROGRAM_ICON_FILENAME);
+
+  si->internal.default_graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR);
+  si->internal.default_sounds_set   = getStringCopy(SND_CLASSIC_SUBDIR);
+  si->internal.default_music_set    = getStringCopy(MUS_CLASSIC_SUBDIR);
+
+  si->internal.fallback_graphics_file = getStringCopy(UNDEFINED_FILENAME);
+  si->internal.fallback_sounds_file   = getStringCopy(UNDEFINED_FILENAME);
+  si->internal.fallback_music_file    = getStringCopy(UNDEFINED_FILENAME);
+
+  si->internal.default_level_series = getStringCopy(UNDEFINED_LEVELSET);
+  si->internal.choose_from_top_leveldir = FALSE;
+  si->internal.show_scaling_in_title = TRUE;
+
+  si->internal.default_window_width  = WIN_XSIZE_DEFAULT;
+  si->internal.default_window_height = WIN_YSIZE_DEFAULT;
+
+  si->debug.frame_delay[0] = DEFAULT_FRAME_DELAY_0;
+  si->debug.frame_delay[1] = DEFAULT_FRAME_DELAY_1;
+  si->debug.frame_delay[2] = DEFAULT_FRAME_DELAY_2;
+  si->debug.frame_delay[3] = DEFAULT_FRAME_DELAY_3;
+  si->debug.frame_delay[4] = DEFAULT_FRAME_DELAY_4;
+  si->debug.frame_delay[5] = DEFAULT_FRAME_DELAY_5;
+  si->debug.frame_delay[6] = DEFAULT_FRAME_DELAY_6;
+  si->debug.frame_delay[7] = DEFAULT_FRAME_DELAY_7;
+  si->debug.frame_delay[8] = DEFAULT_FRAME_DELAY_8;
+  si->debug.frame_delay[9] = DEFAULT_FRAME_DELAY_9;
+
+  si->debug.frame_delay_key[0] = DEFAULT_KEY_FRAME_DELAY_0;
+  si->debug.frame_delay_key[1] = DEFAULT_KEY_FRAME_DELAY_1;
+  si->debug.frame_delay_key[2] = DEFAULT_KEY_FRAME_DELAY_2;
+  si->debug.frame_delay_key[3] = DEFAULT_KEY_FRAME_DELAY_3;
+  si->debug.frame_delay_key[4] = DEFAULT_KEY_FRAME_DELAY_4;
+  si->debug.frame_delay_key[5] = DEFAULT_KEY_FRAME_DELAY_5;
+  si->debug.frame_delay_key[6] = DEFAULT_KEY_FRAME_DELAY_6;
+  si->debug.frame_delay_key[7] = DEFAULT_KEY_FRAME_DELAY_7;
+  si->debug.frame_delay_key[8] = DEFAULT_KEY_FRAME_DELAY_8;
+  si->debug.frame_delay_key[9] = DEFAULT_KEY_FRAME_DELAY_9;
+
+  si->debug.frame_delay_use_mod_key = DEFAULT_FRAME_DELAY_USE_MOD_KEY;
+  si->debug.frame_delay_game_only   = DEFAULT_FRAME_DELAY_GAME_ONLY;
+
+  si->debug.show_frames_per_second = FALSE;
 
-#if defined(CREATE_SPECIAL_EDITION_RND_JUE)
-  si->toons = FALSE;
-  si->handicap = FALSE;
-  si->fullscreen = TRUE;
-  si->override_level_graphics = AUTO;
-  si->override_level_sounds = AUTO;
-  si->override_level_music = AUTO;
-#endif
+  si->options.verbose = FALSE;
 
 #if defined(PLATFORM_ANDROID)
   si->fullscreen = TRUE;
 #endif
 }
 
+static void setSetupInfoToDefaults_AutoSetup(struct SetupInfo *si)
+{
+  si->auto_setup.editor_zoom_tilesize = MINI_TILESIZE;
+}
+
 static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si)
 {
   si->editor_cascade.el_bd             = TRUE;
@@ -11793,13 +9029,75 @@ static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si)
   si->editor_cascade.el_dc             = TRUE;
   si->editor_cascade.el_dx             = TRUE;
 
-  si->editor_cascade.el_chars          = FALSE;
-  si->editor_cascade.el_steel_chars    = FALSE;
-  si->editor_cascade.el_ce             = FALSE;
-  si->editor_cascade.el_ge             = FALSE;
-  si->editor_cascade.el_ref            = FALSE;
-  si->editor_cascade.el_user           = FALSE;
-  si->editor_cascade.el_dynamic                = FALSE;
+  si->editor_cascade.el_mm             = TRUE;
+  si->editor_cascade.el_df             = TRUE;
+
+  si->editor_cascade.el_chars          = FALSE;
+  si->editor_cascade.el_steel_chars    = FALSE;
+  si->editor_cascade.el_ce             = FALSE;
+  si->editor_cascade.el_ge             = FALSE;
+  si->editor_cascade.el_ref            = FALSE;
+  si->editor_cascade.el_user           = FALSE;
+  si->editor_cascade.el_dynamic                = FALSE;
+}
+
+#define MAX_HIDE_SETUP_TOKEN_SIZE              20
+
+static char *getHideSetupToken(void *setup_value)
+{
+  static char hide_setup_token[MAX_HIDE_SETUP_TOKEN_SIZE];
+
+  if (setup_value != NULL)
+    snprintf(hide_setup_token, MAX_HIDE_SETUP_TOKEN_SIZE, "%p", setup_value);
+
+  return hide_setup_token;
+}
+
+void setHideSetupEntry(void *setup_value)
+{
+  char *hide_setup_token = getHideSetupToken(setup_value);
+
+  if (setup_value != NULL)
+    setHashEntry(hide_setup_hash, hide_setup_token, "");
+}
+
+static void setHideSetupEntryRaw(char *token_text, void *setup_value_raw)
+{
+  /* !!! DIRTY WORKAROUND; TO BE FIXED AFTER THE MM ENGINE RELEASE !!! */
+  void *setup_value = setup_value_raw - (void *)&si + (void *)&setup;
+
+  setHideSetupEntry(setup_value);
+}
+
+boolean hideSetupEntry(void *setup_value)
+{
+  char *hide_setup_token = getHideSetupToken(setup_value);
+
+  return (setup_value != NULL &&
+         getHashEntry(hide_setup_hash, hide_setup_token) != NULL);
+}
+
+static void setSetupInfoFromTokenText(SetupFileHash *setup_file_hash,
+                                     struct TokenInfo *token_info,
+                                     int token_nr, char *token_text)
+{
+  char *token_hide_text = getStringCat2(token_text, ".hide");
+  char *token_hide_value = getHashEntry(setup_file_hash, token_hide_text);
+
+  /* set the value of this setup option in the setup option structure */
+  setSetupInfo(token_info, token_nr, getHashEntry(setup_file_hash, token_text));
+
+  /* check if this setup option should be hidden in the setup menu */
+  if (token_hide_value != NULL && get_boolean_from_string(token_hide_value))
+    setHideSetupEntryRaw(token_text, token_info[token_nr].value);
+}
+
+static void setSetupInfoFromTokenInfo(SetupFileHash *setup_file_hash,
+                                     struct TokenInfo *token_info,
+                                     int token_nr)
+{
+  setSetupInfoFromTokenText(setup_file_hash, token_info, token_nr,
+                           token_info[token_nr].text);
 }
 
 static void decodeSetupFileHash(SetupFileHash *setup_file_hash)
@@ -11809,25 +9107,64 @@ static void decodeSetupFileHash(SetupFileHash *setup_file_hash)
   if (!setup_file_hash)
     return;
 
+  if (hide_setup_hash == NULL)
+    hide_setup_hash = newSetupFileHash();
+
   /* global setup */
   si = setup;
   for (i = 0; i < NUM_GLOBAL_SETUP_TOKENS; i++)
-    setSetupInfo(global_setup_tokens, i,
-                getHashEntry(setup_file_hash, global_setup_tokens[i].text));
+    setSetupInfoFromTokenInfo(setup_file_hash, global_setup_tokens, i);
   setup = si;
 
+  /* virtual buttons setup */
+  setup.touch.grid_initialized = TRUE;
+  for (i = 0; i < 2; i++)
+  {
+    int grid_xsize = setup.touch.grid_xsize[i];
+    int grid_ysize = setup.touch.grid_ysize[i];
+    int x, y;
+
+    // if virtual buttons are not loaded from setup file, repeat initializing
+    // virtual buttons grid with default values later when video is initialized
+    if (grid_xsize == -1 ||
+       grid_ysize == -1)
+    {
+      setup.touch.grid_initialized = FALSE;
+
+      continue;
+    }
+
+    for (y = 0; y < grid_ysize; y++)
+    {
+      char token_string[MAX_LINE_LEN];
+
+      sprintf(token_string, "touch.virtual_buttons.%d.%02d", i, y);
+
+      char *value_string = getHashEntry(setup_file_hash, token_string);
+
+      if (value_string == NULL)
+       continue;
+
+      for (x = 0; x < grid_xsize; x++)
+      {
+       char c = value_string[x];
+
+       setup.touch.grid_button[i][x][y] =
+         (c == '.' ? CHAR_GRID_BUTTON_NONE : c);
+      }
+    }
+  }
+
   /* editor setup */
   sei = setup.editor;
   for (i = 0; i < NUM_EDITOR_SETUP_TOKENS; i++)
-    setSetupInfo(editor_setup_tokens, i,
-                getHashEntry(setup_file_hash,editor_setup_tokens[i].text));
+    setSetupInfoFromTokenInfo(setup_file_hash, editor_setup_tokens, i);
   setup.editor = sei;
 
   /* shortcut setup */
   ssi = setup.shortcut;
   for (i = 0; i < NUM_SHORTCUT_SETUP_TOKENS; i++)
-    setSetupInfo(shortcut_setup_tokens, i,
-                getHashEntry(setup_file_hash,shortcut_setup_tokens[i].text));
+    setSetupInfoFromTokenInfo(setup_file_hash, shortcut_setup_tokens, i);
   setup.shortcut = ssi;
 
   /* player setup */
@@ -11843,8 +9180,8 @@ static void decodeSetupFileHash(SetupFileHash *setup_file_hash)
       char full_token[100];
 
       sprintf(full_token, "%s%s", prefix, player_setup_tokens[i].text);
-      setSetupInfo(player_setup_tokens, i,
-                  getHashEntry(setup_file_hash, full_token));
+      setSetupInfoFromTokenText(setup_file_hash, player_setup_tokens, i,
+                               full_token);
     }
     setup.input[pnr] = sii;
   }
@@ -11852,16 +9189,44 @@ static void decodeSetupFileHash(SetupFileHash *setup_file_hash)
   /* system setup */
   syi = setup.system;
   for (i = 0; i < NUM_SYSTEM_SETUP_TOKENS; i++)
-    setSetupInfo(system_setup_tokens, i,
-                getHashEntry(setup_file_hash, system_setup_tokens[i].text));
+    setSetupInfoFromTokenInfo(setup_file_hash, system_setup_tokens, i);
   setup.system = syi;
 
+  /* internal setup */
+  sxi = setup.internal;
+  for (i = 0; i < NUM_INTERNAL_SETUP_TOKENS; i++)
+    setSetupInfoFromTokenInfo(setup_file_hash, internal_setup_tokens, i);
+  setup.internal = sxi;
+
+  /* debug setup */
+  sdi = setup.debug;
+  for (i = 0; i < NUM_DEBUG_SETUP_TOKENS; i++)
+    setSetupInfoFromTokenInfo(setup_file_hash, debug_setup_tokens, i);
+  setup.debug = sdi;
+
   /* options setup */
   soi = setup.options;
   for (i = 0; i < NUM_OPTIONS_SETUP_TOKENS; i++)
-    setSetupInfo(options_setup_tokens, i,
-                getHashEntry(setup_file_hash, options_setup_tokens[i].text));
+    setSetupInfoFromTokenInfo(setup_file_hash, options_setup_tokens, i);
   setup.options = soi;
+
+  setHideRelatedSetupEntries();
+}
+
+static void decodeSetupFileHash_AutoSetup(SetupFileHash *setup_file_hash)
+{
+  int i;
+
+  if (!setup_file_hash)
+    return;
+
+  /* auto setup */
+  sasi = setup.auto_setup;
+  for (i = 0; i < NUM_AUTO_SETUP_TOKENS; i++)
+    setSetupInfo(auto_setup_tokens, i,
+                getHashEntry(setup_file_hash,
+                             auto_setup_tokens[i].text));
+  setup.auto_setup = sasi;
 }
 
 static void decodeSetupFileHash_EditorCascade(SetupFileHash *setup_file_hash)
@@ -11880,43 +9245,82 @@ static void decodeSetupFileHash_EditorCascade(SetupFileHash *setup_file_hash)
   setup.editor_cascade = seci;
 }
 
+void LoadSetupFromFilename(char *filename)
+{
+  SetupFileHash *setup_file_hash = loadSetupFileHash(filename);
+
+  if (setup_file_hash)
+  {
+    decodeSetupFileHash(setup_file_hash);
+
+    freeSetupFileHash(setup_file_hash);
+  }
+  else
+  {
+    Error(ERR_DEBUG, "using default setup values");
+  }
+}
+
+static void LoadSetup_SpecialPostProcessing()
+{
+  char *player_name_new;
+
+  /* needed to work around problems with fixed length strings */
+  player_name_new = get_corrected_login_name(setup.player_name);
+  free(setup.player_name);
+  setup.player_name = player_name_new;
+
+  /* "scroll_delay: on(3) / off(0)" was replaced by scroll delay value */
+  if (setup.scroll_delay == FALSE)
+  {
+    setup.scroll_delay_value = MIN_SCROLL_DELAY;
+    setup.scroll_delay = TRUE;                 /* now always "on" */
+  }
+
+  /* make sure that scroll delay value stays inside valid range */
+  setup.scroll_delay_value =
+    MIN(MAX(MIN_SCROLL_DELAY, setup.scroll_delay_value), MAX_SCROLL_DELAY);
+}
+
 void LoadSetup()
 {
-  char *filename = getSetupFilename();
-  SetupFileHash *setup_file_hash = NULL;
+  char *filename;
 
   /* always start with reliable default values */
   setSetupInfoToDefaults(&setup);
 
-  setup_file_hash = loadSetupFileHash(filename);
+  /* try to load setup values from default setup file */
+  filename = getDefaultSetupFilename();
 
-  if (setup_file_hash)
-  {
-    char *player_name_new;
+  if (fileExists(filename))
+    LoadSetupFromFilename(filename);
 
-    checkSetupFileHashIdentifier(setup_file_hash, filename,getCookie("SETUP"));
-    decodeSetupFileHash(setup_file_hash);
+  /* try to load setup values from user setup file */
+  filename = getSetupFilename();
 
-    freeSetupFileHash(setup_file_hash);
+  LoadSetupFromFilename(filename);
 
-    /* needed to work around problems with fixed length strings */
-    player_name_new = get_corrected_login_name(setup.player_name);
-    free(setup.player_name);
-    setup.player_name = player_name_new;
+  LoadSetup_SpecialPostProcessing();
+}
 
-    /* "scroll_delay: on(3) / off(0)" was replaced by scroll delay value */
-    if (setup.scroll_delay == FALSE)
-    {
-      setup.scroll_delay_value = MIN_SCROLL_DELAY;
-      setup.scroll_delay = TRUE;                       /* now always "on" */
-    }
+void LoadSetup_AutoSetup()
+{
+  char *filename = getPath2(getSetupDir(), AUTOSETUP_FILENAME);
+  SetupFileHash *setup_file_hash = NULL;
+
+  /* always start with reliable default values */
+  setSetupInfoToDefaults_AutoSetup(&setup);
+
+  setup_file_hash = loadSetupFileHash(filename);
+
+  if (setup_file_hash)
+  {
+    decodeSetupFileHash_AutoSetup(setup_file_hash);
 
-    /* make sure that scroll delay value stays inside valid range */
-    setup.scroll_delay_value =
-      MIN(MAX(MIN_SCROLL_DELAY, setup.scroll_delay_value), MAX_SCROLL_DELAY);
+    freeSetupFileHash(setup_file_hash);
   }
-  else
-    Error(ERR_WARN, "using default setup values");
+
+  free(filename);
 }
 
 void LoadSetup_EditorCascade()
@@ -11931,7 +9335,6 @@ void LoadSetup_EditorCascade()
 
   if (setup_file_hash)
   {
-    checkSetupFileHashIdentifier(setup_file_hash, filename,getCookie("SETUP"));
     decodeSetupFileHash_EditorCascade(setup_file_hash);
 
     freeSetupFileHash(setup_file_hash);
@@ -11940,6 +9343,55 @@ void LoadSetup_EditorCascade()
   free(filename);
 }
 
+static void addGameControllerMappingToHash(SetupFileHash *mappings_hash,
+                                          char *mapping_line)
+{
+  char mapping_guid[MAX_LINE_LEN];
+  char *mapping_start, *mapping_end;
+
+  // get GUID from game controller mapping line: copy complete line
+  strncpy(mapping_guid, mapping_line, MAX_LINE_LEN - 1);
+  mapping_guid[MAX_LINE_LEN - 1] = '\0';
+
+  // get GUID from game controller mapping line: cut after GUID part
+  mapping_start = strchr(mapping_guid, ',');
+  if (mapping_start != NULL)
+    *mapping_start = '\0';
+
+  // cut newline from game controller mapping line
+  mapping_end = strchr(mapping_line, '\n');
+  if (mapping_end != NULL)
+    *mapping_end = '\0';
+
+  // add mapping entry to game controller mappings hash
+  setHashEntry(mappings_hash, mapping_guid, mapping_line);
+}
+
+static void LoadSetup_ReadGameControllerMappings(SetupFileHash *mappings_hash,
+                                                char *filename)
+{
+  FILE *file;
+
+  if (!(file = fopen(filename, MODE_READ)))
+  {
+    Error(ERR_WARN, "cannot read game controller mappings file '%s'", filename);
+
+    return;
+  }
+
+  while (!feof(file))
+  {
+    char line[MAX_LINE_LEN];
+
+    if (!fgets(line, MAX_LINE_LEN, file))
+      break;
+
+    addGameControllerMappingToHash(mappings_hash, line);
+  }
+
+  fclose(file);
+}
+
 void SaveSetup()
 {
   char *filename = getSetupFilename();
@@ -11954,9 +9406,7 @@ void SaveSetup()
     return;
   }
 
-  fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
-                                              getCookie("SETUP")));
-  fprintf(file, "\n");
+  fprintFileHeader(file, SETUP_FILENAME);
 
   /* global setup */
   si = setup;
@@ -11966,12 +9416,44 @@ void SaveSetup()
     if (i == SETUP_TOKEN_PLAYER_NAME + 1 ||
        i == SETUP_TOKEN_GRAPHICS_SET ||
        i == SETUP_TOKEN_VOLUME_SIMPLE ||
-       i == SETUP_TOKEN_TOUCH_CONTROL_TYPE)
+       i == SETUP_TOKEN_NETWORK_MODE ||
+       i == SETUP_TOKEN_TOUCH_CONTROL_TYPE ||
+       i == SETUP_TOKEN_TOUCH_GRID_XSIZE_0 ||
+       i == SETUP_TOKEN_TOUCH_GRID_XSIZE_1)
       fprintf(file, "\n");
 
     fprintf(file, "%s\n", getSetupLine(global_setup_tokens, "", i));
   }
 
+  /* virtual buttons setup */
+  for (i = 0; i < 2; i++)
+  {
+    int grid_xsize = setup.touch.grid_xsize[i];
+    int grid_ysize = setup.touch.grid_ysize[i];
+    int x, y;
+
+    fprintf(file, "\n");
+
+    for (y = 0; y < grid_ysize; y++)
+    {
+      char token_string[MAX_LINE_LEN];
+      char value_string[MAX_LINE_LEN];
+
+      sprintf(token_string, "touch.virtual_buttons.%d.%02d", i, y);
+
+      for (x = 0; x < grid_xsize; x++)
+      {
+       char c = setup.touch.grid_button[i][x][y];
+
+       value_string[x] = (c == CHAR_GRID_BUTTON_NONE ? '.' : c);
+      }
+
+      value_string[grid_xsize] = '\0';
+
+      fprintf(file, "%s\n", getFormattedSetupEntry(token_string, value_string));
+    }
+  }
+
   /* editor setup */
   sei = setup.editor;
   fprintf(file, "\n");
@@ -12003,6 +9485,15 @@ void SaveSetup()
   for (i = 0; i < NUM_SYSTEM_SETUP_TOKENS; i++)
     fprintf(file, "%s\n", getSetupLine(system_setup_tokens, "", i));
 
+  /* internal setup */
+  /* (internal setup values not saved to user setup file) */
+
+  /* debug setup */
+  sdi = setup.debug;
+  fprintf(file, "\n");
+  for (i = 0; i < NUM_DEBUG_SETUP_TOKENS; i++)
+    fprintf(file, "%s\n", getSetupLine(debug_setup_tokens, "", i));
+
   /* options setup */
   soi = setup.options;
   fprintf(file, "\n");
@@ -12014,6 +9505,34 @@ void SaveSetup()
   SetFilePermissions(filename, PERMS_PRIVATE);
 }
 
+void SaveSetup_AutoSetup()
+{
+  char *filename = getPath2(getSetupDir(), AUTOSETUP_FILENAME);
+  FILE *file;
+  int i;
+
+  InitUserDataDirectory();
+
+  if (!(file = fopen(filename, MODE_WRITE)))
+  {
+    Error(ERR_WARN, "cannot write auto setup file '%s'", filename);
+    free(filename);
+    return;
+  }
+
+  fprintFileHeader(file, AUTOSETUP_FILENAME);
+
+  sasi = setup.auto_setup;
+  for (i = 0; i < NUM_AUTO_SETUP_TOKENS; i++)
+    fprintf(file, "%s\n", getSetupLine(auto_setup_tokens, "", i));
+
+  fclose(file);
+
+  SetFilePermissions(filename, PERMS_PRIVATE);
+
+  free(filename);
+}
+
 void SaveSetup_EditorCascade()
 {
   char *filename = getPath2(getSetupDir(), EDITORCASCADE_FILENAME);
@@ -12029,12 +9548,9 @@ void SaveSetup_EditorCascade()
     return;
   }
 
-  fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
-                                              getCookie("SETUP")));
-  fprintf(file, "\n");
+  fprintFileHeader(file, EDITORCASCADE_FILENAME);
 
   seci = setup.editor_cascade;
-  fprintf(file, "\n");
   for (i = 0; i < NUM_EDITOR_CASCADE_SETUP_TOKENS; i++)
     fprintf(file, "%s\n", getSetupLine(editor_cascade_setup_tokens, "", i));
 
@@ -12045,6 +9561,47 @@ void SaveSetup_EditorCascade()
   free(filename);
 }
 
+static void SaveSetup_WriteGameControllerMappings(SetupFileHash *mappings_hash,
+                                                 char *filename)
+{
+  FILE *file;
+
+  if (!(file = fopen(filename, MODE_WRITE)))
+  {
+    Error(ERR_WARN, "cannot write game controller mappings file '%s'",filename);
+
+    return;
+  }
+
+  BEGIN_HASH_ITERATION(mappings_hash, itr)
+  {
+    fprintf(file, "%s\n", HASH_ITERATION_VALUE(itr));
+  }
+  END_HASH_ITERATION(mappings_hash, itr)
+
+  fclose(file);
+}
+
+void SaveSetup_AddGameControllerMapping(char *mapping)
+{
+  char *filename = getPath2(getSetupDir(), GAMECONTROLLER_BASENAME);
+  SetupFileHash *mappings_hash = newSetupFileHash();
+
+  InitUserDataDirectory();
+
+  // load existing personal game controller mappings
+  LoadSetup_ReadGameControllerMappings(mappings_hash, filename);
+
+  // add new mapping to personal game controller mappings
+  addGameControllerMappingToHash(mappings_hash, mapping);
+
+  // save updated personal game controller mappings
+  SaveSetup_WriteGameControllerMappings(mappings_hash, filename);
+
+  freeSetupFileHash(mappings_hash);
+  free(filename);
+}
+
 void LoadCustomElementDescriptions()
 {
   char *filename = getCustomArtworkConfigFilename(ARTWORK_TYPE_GRAPHICS);
@@ -12079,19 +9636,10 @@ void LoadCustomElementDescriptions()
 
 static int getElementFromToken(char *token)
 {
-#if 1
   char *value = getHashEntry(element_token_hash, token);
 
   if (value != NULL)
     return atoi(value);
-#else
-  int i;
-
-  /* !!! OPTIMIZE THIS BY USING HASH !!! */
-  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
-    if (strEqual(token, element_info[i].token_name))
-      return i;
-#endif
 
   Error(ERR_WARN, "unknown element token '%s'", token);
 
@@ -12109,25 +9657,8 @@ static int get_token_parameter_value(char *token, char *value_raw)
   if (suffix == NULL)
     suffix = token;
 
-#if 1
   if (strEqual(suffix, ".element"))
     return getElementFromToken(value_raw);
-#endif
-
-#if 0
-  if (strncmp(suffix, ".font", 5) == 0)
-  {
-    int i;
-
-    /* !!! OPTIMIZE THIS BY USING HASH !!! */
-    for (i = 0; i < NUM_FONTS; i++)
-      if (strEqual(value_raw, font_info[i].token_name))
-       return i;
-
-    /* if font not found, use reliable default value */
-    return FONT_INITIAL_1;
-  }
-#endif
 
   /* !!! USE CORRECT VALUE TYPE (currently works also for TYPE_BOOLEAN) !!! */
   return get_parameter_value(value_raw, suffix, TYPE_INTEGER);
@@ -12135,24 +9666,8 @@ static int get_token_parameter_value(char *token, char *value_raw)
 
 void InitMenuDesignSettings_Static()
 {
-#if 0
-  static SetupFileHash *image_config_hash = NULL;
-#endif
   int i;
 
-#if 0
-  if (image_config_hash == NULL)
-  {
-    image_config_hash = newSetupFileHash();
-
-    for (i = 0; image_config[i].token != NULL; i++)
-      setHashEntry(image_config_hash,
-                  image_config[i].token,
-                  image_config[i].value);
-  }
-#endif
-
-#if 1
   /* always start with reliable default values from static default config */
   for (i = 0; image_config_vars[i].token != NULL; i++)
   {
@@ -12162,19 +9677,6 @@ void InitMenuDesignSettings_Static()
       *image_config_vars[i].value =
        get_token_parameter_value(image_config_vars[i].token, value);
   }
-
-#else
-
-  int j;
-
-  /* always start with reliable default values from static default config */
-  for (i = 0; image_config_vars[i].token != NULL; i++)
-    for (j = 0; image_config[j].token != NULL; j++)
-      if (strEqual(image_config_vars[i].token, image_config[j].token))
-       *image_config_vars[i].value =
-         get_token_parameter_value(image_config_vars[i].token,
-                                   image_config[j].value);
-#endif
 }
 
 static void InitMenuDesignSettings_SpecialPreProcessing()
@@ -12185,6 +9687,39 @@ static void InitMenuDesignSettings_SpecialPreProcessing()
 
   /* special case: initialize "ARG_DEFAULT" values in static default config */
   /* (e.g., initialize "[titlemessage].fade_mode" from "[title].fade_mode") */
+  titlescreen_initial_first_default.fade_mode  =
+    title_initial_first_default.fade_mode;
+  titlescreen_initial_first_default.fade_delay =
+    title_initial_first_default.fade_delay;
+  titlescreen_initial_first_default.post_delay =
+    title_initial_first_default.post_delay;
+  titlescreen_initial_first_default.auto_delay =
+    title_initial_first_default.auto_delay;
+  titlescreen_first_default.fade_mode  = title_first_default.fade_mode;
+  titlescreen_first_default.fade_delay = title_first_default.fade_delay;
+  titlescreen_first_default.post_delay = title_first_default.post_delay;
+  titlescreen_first_default.auto_delay = title_first_default.auto_delay;
+  titlemessage_initial_first_default.fade_mode  =
+    title_initial_first_default.fade_mode;
+  titlemessage_initial_first_default.fade_delay =
+    title_initial_first_default.fade_delay;
+  titlemessage_initial_first_default.post_delay =
+    title_initial_first_default.post_delay;
+  titlemessage_initial_first_default.auto_delay =
+    title_initial_first_default.auto_delay;
+  titlemessage_first_default.fade_mode  = title_first_default.fade_mode;
+  titlemessage_first_default.fade_delay = title_first_default.fade_delay;
+  titlemessage_first_default.post_delay = title_first_default.post_delay;
+  titlemessage_first_default.auto_delay = title_first_default.auto_delay;
+
+  titlescreen_initial_default.fade_mode  = title_initial_default.fade_mode;
+  titlescreen_initial_default.fade_delay = title_initial_default.fade_delay;
+  titlescreen_initial_default.post_delay = title_initial_default.post_delay;
+  titlescreen_initial_default.auto_delay = title_initial_default.auto_delay;
+  titlescreen_default.fade_mode  = title_default.fade_mode;
+  titlescreen_default.fade_delay = title_default.fade_delay;
+  titlescreen_default.post_delay = title_default.post_delay;
+  titlescreen_default.auto_delay = title_default.auto_delay;
   titlemessage_initial_default.fade_mode  = title_initial_default.fade_mode;
   titlemessage_initial_default.fade_delay = title_initial_default.fade_delay;
   titlemessage_initial_default.post_delay = title_initial_default.post_delay;
@@ -12198,6 +9733,13 @@ static void InitMenuDesignSettings_SpecialPreProcessing()
   /* (e.g., init "titlemessage_1.fade_mode" from "[titlemessage].fade_mode") */
   for (i = 0; i < MAX_NUM_TITLE_MESSAGES; i++)
   {
+    titlescreen_initial_first[i] = titlescreen_initial_first_default;
+    titlescreen_first[i] = titlescreen_first_default;
+    titlemessage_initial_first[i] = titlemessage_initial_first_default;
+    titlemessage_first[i] = titlemessage_first_default;
+
+    titlescreen_initial[i] = titlescreen_initial_default;
+    titlescreen[i] = titlescreen_default;
     titlemessage_initial[i] = titlemessage_initial_default;
     titlemessage[i] = titlemessage_default;
   }
@@ -12206,31 +9748,112 @@ static void InitMenuDesignSettings_SpecialPreProcessing()
   /* (eg, init "menu.enter_screen.SCORES.xyz" from "menu.enter_screen.xyz") */
   for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
   {
+    if (i == GFX_SPECIAL_ARG_TITLE)    /* title values already initialized */
+      continue;
+
     menu.enter_screen[i] = menu.enter_screen[GFX_SPECIAL_ARG_DEFAULT];
     menu.leave_screen[i] = menu.leave_screen[GFX_SPECIAL_ARG_DEFAULT];
+    menu.next_screen[i]  = menu.next_screen[GFX_SPECIAL_ARG_DEFAULT];
+  }
+
+  /* special case: initialize "ARG_DEFAULT" values in static default config */
+  /* (eg, init "viewport.door_1.MAIN.xyz" from "viewport.door_1.xyz") */
+  for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
+  {
+    viewport.window[i]    = viewport.window[GFX_SPECIAL_ARG_DEFAULT];
+    viewport.playfield[i] = viewport.playfield[GFX_SPECIAL_ARG_DEFAULT];
+    viewport.door_1[i]    = viewport.door_1[GFX_SPECIAL_ARG_DEFAULT];
+
+    if (i == GFX_SPECIAL_ARG_EDITOR)   /* editor values already initialized */
+      continue;
+
+    viewport.door_2[i] = viewport.door_2[GFX_SPECIAL_ARG_DEFAULT];
+  }
+}
+
+static void InitMenuDesignSettings_SpecialPostProcessing()
+{
+  static struct
+  {
+    struct XY *dst, *src;
+  }
+  game_buttons_xy[] =
+  {
+    { &game.button.save,       &game.button.stop       },
+    { &game.button.pause2,     &game.button.pause      },
+    { &game.button.load,       &game.button.play       },
+    { &game.button.undo,       &game.button.stop       },
+    { &game.button.redo,       &game.button.play       },
+
+    { NULL,                    NULL                    }
+  };
+  int i;
+
+  /* special case: initialize later added SETUP list size from LEVELS value */
+  if (menu.list_size[GAME_MODE_SETUP] == -1)
+    menu.list_size[GAME_MODE_SETUP] = menu.list_size[GAME_MODE_LEVELS];
+
+  /* set default position for snapshot buttons to stop/pause/play buttons */
+  for (i = 0; game_buttons_xy[i].dst != NULL; i++)
+    if ((*game_buttons_xy[i].dst).x == -1 &&
+       (*game_buttons_xy[i].dst).y == -1)
+      *game_buttons_xy[i].dst = *game_buttons_xy[i].src;
+}
+
+static void InitMenuDesignSettings_SpecialPostProcessing_AfterGraphics()
+{
+  static struct
+  {
+    struct XYTileSize *dst, *src;
+    int graphic;
   }
+  editor_buttons_xy[] =
+  {
+    {
+      &editor.button.element_left,     &editor.palette.element_left,
+      IMG_GFX_EDITOR_BUTTON_ELEMENT_LEFT
+    },
+    {
+      &editor.button.element_middle,   &editor.palette.element_middle,
+      IMG_GFX_EDITOR_BUTTON_ELEMENT_MIDDLE
+    },
+    {
+      &editor.button.element_right,    &editor.palette.element_right,
+      IMG_GFX_EDITOR_BUTTON_ELEMENT_RIGHT
+    },
+
+    { NULL,                    NULL                    }
+  };
+  int i;
 
-  /* special case: initialize "ARG_DEFAULT" values in static default config */
-  /* (eg, init "viewport.door_1.MAIN.xyz" from "viewport.door_1.xyz") */
-  for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
+  /* set default position for element buttons to element graphics */
+  for (i = 0; editor_buttons_xy[i].dst != NULL; i++)
   {
-    viewport.playfield[i] = viewport.playfield[GFX_SPECIAL_ARG_DEFAULT];
-    viewport.door_1[i] = viewport.door_1[GFX_SPECIAL_ARG_DEFAULT];
-    if (i != GFX_SPECIAL_ARG_EDITOR)   /* editor value already initialized */
-      viewport.door_2[i] = viewport.door_2[GFX_SPECIAL_ARG_DEFAULT];
-  }
-}
+    if ((*editor_buttons_xy[i].dst).x == -1 &&
+       (*editor_buttons_xy[i].dst).y == -1)
+    {
+      struct GraphicInfo *gd = &graphic_info[editor_buttons_xy[i].graphic];
 
-static void InitMenuDesignSettings_SpecialPostProcessing()
-{
-  /* special case: initialize later added SETUP list size from LEVELS value */
-  if (menu.list_size[GAME_MODE_SETUP] == -1)
-    menu.list_size[GAME_MODE_SETUP] = menu.list_size[GAME_MODE_LEVELS];
+      gd->width = gd->height = editor_buttons_xy[i].src->tile_size;
+
+      *editor_buttons_xy[i].dst = *editor_buttons_xy[i].src;
+    }
+  }
 }
 
 static void LoadMenuDesignSettingsFromFilename(char *filename)
 {
+  static struct TitleFadingInfo tfi;
   static struct TitleMessageInfo tmi;
+  static struct TokenInfo title_tokens[] =
+  {
+    { TYPE_INTEGER,    &tfi.fade_mode,         ".fade_mode"            },
+    { TYPE_INTEGER,    &tfi.fade_delay,        ".fade_delay"           },
+    { TYPE_INTEGER,    &tfi.post_delay,        ".post_delay"           },
+    { TYPE_INTEGER,    &tfi.auto_delay,        ".auto_delay"           },
+
+    { -1,              NULL,                   NULL                    }
+  };
   static struct TokenInfo titlemessage_tokens[] =
   {
     { TYPE_INTEGER,    &tmi.x,                 ".x"                    },
@@ -12254,12 +9877,60 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
     { -1,              NULL,                   NULL                    }
   };
   static struct
+  {
+    struct TitleFadingInfo *info;
+    char *text;
+  }
+  title_info[] =
+  {
+    /* initialize first titles from "enter screen" definitions, if defined */
+    { &title_initial_first_default,    "menu.enter_screen.TITLE"       },
+    { &title_first_default,            "menu.enter_screen.TITLE"       },
+
+    /* initialize title screens from "next screen" definitions, if defined */
+    { &title_initial_default,          "menu.next_screen.TITLE"        },
+    { &title_default,                  "menu.next_screen.TITLE"        },
+
+    { NULL,                            NULL                            }
+  };
+  static struct
   {
     struct TitleMessageInfo *array;
     char *text;
   }
   titlemessage_arrays[] =
   {
+    /* initialize first titles from "enter screen" definitions, if defined */
+    { titlescreen_initial_first,       "menu.enter_screen.TITLE"       },
+    { titlescreen_first,               "menu.enter_screen.TITLE"       },
+    { titlemessage_initial_first,      "menu.enter_screen.TITLE"       },
+    { titlemessage_first,              "menu.enter_screen.TITLE"       },
+
+    /* initialize titles from "next screen" definitions, if defined */
+    { titlescreen_initial,             "menu.next_screen.TITLE"        },
+    { titlescreen,                     "menu.next_screen.TITLE"        },
+    { titlemessage_initial,            "menu.next_screen.TITLE"        },
+    { titlemessage,                    "menu.next_screen.TITLE"        },
+
+    /* overwrite titles with title definitions, if defined */
+    { titlescreen_initial_first,       "[title_initial]"               },
+    { titlescreen_first,               "[title]"                       },
+    { titlemessage_initial_first,      "[title_initial]"               },
+    { titlemessage_first,              "[title]"                       },
+
+    { titlescreen_initial,             "[title_initial]"               },
+    { titlescreen,                     "[title]"                       },
+    { titlemessage_initial,            "[title_initial]"               },
+    { titlemessage,                    "[title]"                       },
+
+    /* overwrite titles with title screen/message definitions, if defined */
+    { titlescreen_initial_first,       "[titlescreen_initial]"         },
+    { titlescreen_first,               "[titlescreen]"                 },
+    { titlemessage_initial_first,      "[titlemessage_initial]"        },
+    { titlemessage_first,              "[titlemessage]"                },
+
+    { titlescreen_initial,             "[titlescreen_initial]"         },
+    { titlescreen,                     "[titlescreen]"                 },
     { titlemessage_initial,            "[titlemessage_initial]"        },
     { titlemessage,                    "[titlemessage]"                },
 
@@ -12268,10 +9939,6 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
   SetupFileHash *setup_file_hash;
   int i, j, k;
 
-#if 0
-  printf("LoadMenuDesignSettings from file '%s' ...\n", filename);
-#endif
-
   if ((setup_file_hash = loadSetupFileHash(filename)) == NULL)
     return;
 
@@ -12304,6 +9971,14 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
       menu.draw_xoffset_info[i] = get_integer_from_string(value_1);
     if (value_2 != NULL)
       menu.draw_yoffset_info[i] = get_integer_from_string(value_2);
+
+    if (i == GFX_SPECIAL_ARG_INFO_ELEMENTS)
+    {
+      char *value_1 = getHashEntry(setup_file_hash, "menu.list_size.INFO");
+
+      if (value_1 != NULL)
+       menu.list_size_info[i] = get_integer_from_string(value_1);
+    }
   }
 
   /* special case: initialize with default values that may be overwritten */
@@ -12319,6 +9994,40 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
       menu.draw_yoffset_setup[i] = get_integer_from_string(value_2);
   }
 
+  /* special case: initialize with default values that may be overwritten */
+  /* (eg, init "menu.line_spacing.INFO[XXX]" from "menu.line_spacing.INFO") */
+  for (i = 0; i < NUM_SPECIAL_GFX_INFO_ARGS; i++)
+  {
+    char *value_1 = getHashEntry(setup_file_hash,"menu.left_spacing.INFO");
+    char *value_2 = getHashEntry(setup_file_hash,"menu.right_spacing.INFO");
+    char *value_3 = getHashEntry(setup_file_hash,"menu.top_spacing.INFO");
+    char *value_4 = getHashEntry(setup_file_hash,"menu.bottom_spacing.INFO");
+    char *value_5 = getHashEntry(setup_file_hash,"menu.paragraph_spacing.INFO");
+    char *value_6 = getHashEntry(setup_file_hash,"menu.headline1_spacing.INFO");
+    char *value_7 = getHashEntry(setup_file_hash,"menu.headline2_spacing.INFO");
+    char *value_8 = getHashEntry(setup_file_hash,"menu.line_spacing.INFO");
+    char *value_9 = getHashEntry(setup_file_hash,"menu.extra_spacing.INFO");
+
+    if (value_1 != NULL)
+      menu.left_spacing_info[i]      = get_integer_from_string(value_1);
+    if (value_2 != NULL)
+      menu.right_spacing_info[i]     = get_integer_from_string(value_2);
+    if (value_3 != NULL)
+      menu.top_spacing_info[i]       = get_integer_from_string(value_3);
+    if (value_4 != NULL)
+      menu.bottom_spacing_info[i]    = get_integer_from_string(value_4);
+    if (value_5 != NULL)
+      menu.paragraph_spacing_info[i] = get_integer_from_string(value_5);
+    if (value_6 != NULL)
+      menu.headline1_spacing_info[i] = get_integer_from_string(value_6);
+    if (value_7 != NULL)
+      menu.headline2_spacing_info[i] = get_integer_from_string(value_7);
+    if (value_8 != NULL)
+      menu.line_spacing_info[i]      = get_integer_from_string(value_8);
+    if (value_9 != NULL)
+      menu.extra_spacing_info[i]     = get_integer_from_string(value_9);
+  }
+
   /* special case: initialize with default values that may be overwritten */
   /* (eg, init "menu.enter_screen.SCORES.xyz" from "menu.enter_screen.xyz") */
   for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
@@ -12329,12 +10038,18 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
     char *token_4 = "menu.leave_screen.fade_mode";
     char *token_5 = "menu.leave_screen.fade_delay";
     char *token_6 = "menu.leave_screen.post_delay";
+    char *token_7 = "menu.next_screen.fade_mode";
+    char *token_8 = "menu.next_screen.fade_delay";
+    char *token_9 = "menu.next_screen.post_delay";
     char *value_1 = getHashEntry(setup_file_hash, token_1);
     char *value_2 = getHashEntry(setup_file_hash, token_2);
     char *value_3 = getHashEntry(setup_file_hash, token_3);
     char *value_4 = getHashEntry(setup_file_hash, token_4);
     char *value_5 = getHashEntry(setup_file_hash, token_5);
     char *value_6 = getHashEntry(setup_file_hash, token_6);
+    char *value_7 = getHashEntry(setup_file_hash, token_7);
+    char *value_8 = getHashEntry(setup_file_hash, token_8);
+    char *value_9 = getHashEntry(setup_file_hash, token_9);
 
     if (value_1 != NULL)
       menu.enter_screen[i].fade_mode = get_token_parameter_value(token_1,
@@ -12354,12 +10069,23 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
     if (value_6 != NULL)
       menu.leave_screen[i].post_delay = get_token_parameter_value(token_6,
                                                                  value_6);
+    if (value_7 != NULL)
+      menu.next_screen[i].fade_mode = get_token_parameter_value(token_7,
+                                                               value_7);
+    if (value_8 != NULL)
+      menu.next_screen[i].fade_delay = get_token_parameter_value(token_8,
+                                                                value_8);
+    if (value_9 != NULL)
+      menu.next_screen[i].post_delay = get_token_parameter_value(token_9,
+                                                                value_9);
   }
 
   /* special case: initialize with default values that may be overwritten */
   /* (eg, init "viewport.door_1.MAIN.xyz" from "viewport.door_1.xyz") */
   for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
   {
+    char *token_w1 = "viewport.window.width";
+    char *token_w2 = "viewport.window.height";
     char *token_01 = "viewport.playfield.x";
     char *token_02 = "viewport.playfield.y";
     char *token_03 = "viewport.playfield.width";
@@ -12375,6 +10101,8 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
     char *token_13 = "viewport.door_2.width";
     char *token_14 = "viewport.door_2.height";
     char *token_15 = "viewport.door_2.border_size";
+    char *value_w1 = getHashEntry(setup_file_hash, token_w1);
+    char *value_w2 = getHashEntry(setup_file_hash, token_w2);
     char *value_01 = getHashEntry(setup_file_hash, token_01);
     char *value_02 = getHashEntry(setup_file_hash, token_02);
     char *value_03 = getHashEntry(setup_file_hash, token_03);
@@ -12391,6 +10119,10 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
     char *value_14 = getHashEntry(setup_file_hash, token_14);
     char *value_15 = getHashEntry(setup_file_hash, token_15);
 
+    if (value_w1 != NULL)
+      viewport.window[i].width = get_token_parameter_value(token_w1, value_w1);
+    if (value_w2 != NULL)
+      viewport.window[i].height = get_token_parameter_value(token_w2, value_w2);
     if (value_01 != NULL)
       viewport.playfield[i].x = get_token_parameter_value(token_01, value_01);
     if (value_02 != NULL)
@@ -12428,6 +10160,33 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
                                                                 value_15);
   }
 
+  /* special case: initialize with default values that may be overwritten */
+  /* (e.g., init "[title].fade_mode" from "menu.next_screen.TITLE.fade_mode") */
+  for (i = 0; title_info[i].info != NULL; i++)
+  {
+    struct TitleFadingInfo *info = title_info[i].info;
+    char *base_token = title_info[i].text;
+
+    for (j = 0; title_tokens[j].type != -1; j++)
+    {
+      char *token = getStringCat2(base_token, title_tokens[j].text);
+      char *value = getHashEntry(setup_file_hash, token);
+
+      if (value != NULL)
+      {
+       int parameter_value = get_token_parameter_value(token, value);
+
+       tfi = *info;
+
+       *(int *)title_tokens[j].value = (int)parameter_value;
+
+       *info = tfi;
+      }
+
+      free(token);
+    }
+  }
+
   /* special case: initialize with default values that may be overwritten */
   /* (e.g., init "titlemessage_1.fade_mode" from "[titlemessage].fade_mode") */
   for (i = 0; titlemessage_arrays[i].array != NULL; i++)
@@ -12449,9 +10208,9 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
          tmi = array[k];
 
          if (titlemessage_tokens[j].type == TYPE_INTEGER)
-           *(boolean *)titlemessage_tokens[j].value = (boolean)parameter_value;
-         else
            *(int     *)titlemessage_tokens[j].value = (int)parameter_value;
+         else
+           *(boolean *)titlemessage_tokens[j].value = (boolean)parameter_value;
 
          array[k] = tmi;
        }
@@ -12482,11 +10241,7 @@ void LoadMenuDesignSettings()
   InitMenuDesignSettings_Static();
   InitMenuDesignSettings_SpecialPreProcessing();
 
-#if 1
   if (!GFX_OVERRIDE_ARTWORK(ARTWORK_TYPE_GRAPHICS))
-#else
-  if (!SETUP_OVERRIDE_ARTWORK(setup, ARTWORK_TYPE_GRAPHICS))
-#endif
   {
     /* first look for special settings configured in level series config */
     filename_base = getCustomArtworkLevelConfigFilename(ARTWORK_TYPE_GRAPHICS);
@@ -12503,6 +10258,11 @@ void LoadMenuDesignSettings()
   InitMenuDesignSettings_SpecialPostProcessing();
 }
 
+void LoadMenuDesignSettings_AfterGraphics()
+{
+  InitMenuDesignSettings_SpecialPostProcessing_AfterGraphics();
+}
+
 void LoadUserDefinedEditorElementList(int **elements, int *num_elements)
 {
   char *filename = getEditorSetupFilename();
@@ -12625,10 +10385,6 @@ static struct MusicFileInfo *get_music_file_info_ext(char *basename, int music,
     *strrchr(filename_prefix, '.') = '\0';
   filename_info = getStringCat2(filename_prefix, ".txt");
 
-#if 0
-  printf("trying to load file '%s'...\n", filename_info);
-#endif
-
   if (fileExists(filename_info))
     setup_file_hash = loadSetupFileHash(filename_info);
 
@@ -12642,10 +10398,6 @@ static struct MusicFileInfo *get_music_file_info_ext(char *basename, int music,
     filename_prefix = getStringCopy(filename_music);
     filename_info = getStringCat2(filename_prefix, ".txt");
 
-#if 0
-    printf("trying to load file '%s'...\n", filename_info);
-#endif
-
     if (fileExists(filename_info))
       setup_file_hash = loadSetupFileHash(filename_info);
 
@@ -12708,8 +10460,6 @@ static boolean sound_info_listed(struct MusicFileInfo *list, char *basename)
   return music_info_listed_ext(list, basename, TRUE);
 }
 
-#if 1
-
 void LoadMusicInfo()
 {
   char *music_directory = getCustomMusicDirectory();
@@ -12759,17 +10509,10 @@ void LoadMusicInfo()
     if (!FileIsMusic(music->filename))
       continue;
 
-#if 0
-    printf("::: -> '%s' (configured)\n", music->filename);
-#endif
-
     if (!music_info_listed(music_file_info, music->filename))
     {
       *new = get_music_file_info(music->filename, i);
-#if 0
-      if (*new != NULL)
-       printf(":1: adding '%s' ['%s'] ...\n", (*new)->title, music->filename);
-#endif
+
       if (*new != NULL)
        new = &(*new)->next;
     }
@@ -12805,172 +10548,13 @@ void LoadMusicInfo()
     if (music_already_used)
       continue;
 
-    if (!FileIsMusic(basename))
+    if (!FileIsMusic(dir_entry->filename))
       continue;
 
-#if 0
-    printf("::: -> '%s' (found in directory)\n", basename);
-#endif
-
     if (!music_info_listed(music_file_info, basename))
     {
       *new = get_music_file_info(basename, MAP_NOCONF_MUSIC(num_music_noconf));
-#if 0
-      if (*new != NULL)
-       printf(":2: adding '%s' ['%s'] ...\n", (*new)->title, basename);
-#endif
-      if (*new != NULL)
-       new = &(*new)->next;
-    }
-
-    num_music_noconf++;
-  }
-
-  closeDirectory(dir);
-
-  for (i = 0; i < num_sounds; i++)
-  {
-    sound = getSoundListEntry(i);
-
-    if (sound->filename == NULL)
-      continue;
-
-    if (strEqual(sound->filename, UNDEFINED_FILENAME))
-      continue;
-
-    /* a configured file may be not recognized as sound */
-    if (!FileIsSound(sound->filename))
-      continue;
-
-#if 0
-    printf("::: -> '%s' (configured)\n", sound->filename);
-#endif
-
-    if (!sound_info_listed(music_file_info, sound->filename))
-    {
-      *new = get_sound_file_info(sound->filename, i);
-      if (*new != NULL)
-       new = &(*new)->next;
-    }
-  }
-
-#if 0
-  for (next = music_file_info; next != NULL; next = next->next)
-    printf("::: title == '%s'\n", next->title);
-#endif
-}
-
-#else
-
-void LoadMusicInfo()
-{
-  char *music_directory = getCustomMusicDirectory();
-  int num_music = getMusicListSize();
-  int num_music_noconf = 0;
-  int num_sounds = getSoundListSize();
-  DIR *dir;
-  struct dirent *dir_entry;
-  struct FileInfo *music, *sound;
-  struct MusicFileInfo *next, **new;
-  int i;
-
-  while (music_file_info != NULL)
-  {
-    next = music_file_info->next;
-
-    checked_free(music_file_info->basename);
-
-    checked_free(music_file_info->title_header);
-    checked_free(music_file_info->artist_header);
-    checked_free(music_file_info->album_header);
-    checked_free(music_file_info->year_header);
-
-    checked_free(music_file_info->title);
-    checked_free(music_file_info->artist);
-    checked_free(music_file_info->album);
-    checked_free(music_file_info->year);
-
-    free(music_file_info);
-
-    music_file_info = next;
-  }
-
-  new = &music_file_info;
-
-  for (i = 0; i < num_music; i++)
-  {
-    music = getMusicListEntry(i);
-
-    if (music->filename == NULL)
-      continue;
-
-    if (strEqual(music->filename, UNDEFINED_FILENAME))
-      continue;
-
-    /* a configured file may be not recognized as music */
-    if (!FileIsMusic(music->filename))
-      continue;
-
-#if 0
-    printf("::: -> '%s' (configured)\n", music->filename);
-#endif
-
-    if (!music_info_listed(music_file_info, music->filename))
-    {
-      *new = get_music_file_info(music->filename, i);
-#if 0
-      if (*new != NULL)
-       printf(":1: adding '%s' ['%s'] ...\n", (*new)->title, music->filename);
-#endif
-      if (*new != NULL)
-       new = &(*new)->next;
-    }
-  }
-
-  if ((dir = opendir(music_directory)) == NULL)
-  {
-    Error(ERR_WARN, "cannot read music directory '%s'", music_directory);
-    return;
-  }
-
-  while ((dir_entry = readdir(dir)) != NULL)   /* loop until last dir entry */
-  {
-    char *basename = dir_entry->d_name;
-    boolean music_already_used = FALSE;
-    int i;
-
-    /* skip all music files that are configured in music config file */
-    for (i = 0; i < num_music; i++)
-    {
-      music = getMusicListEntry(i);
-
-      if (music->filename == NULL)
-       continue;
-
-      if (strEqual(basename, music->filename))
-      {
-       music_already_used = TRUE;
-       break;
-      }
-    }
-
-    if (music_already_used)
-      continue;
-
-    if (!FileIsMusic(basename))
-      continue;
-
-#if 0
-    printf("::: -> '%s' (found in directory)\n", basename);
-#endif
 
-    if (!music_info_listed(music_file_info, basename))
-    {
-      *new = get_music_file_info(basename, MAP_NOCONF_MUSIC(num_music_noconf));
-#if 0
-      if (*new != NULL)
-       printf(":2: adding '%s' ['%s'] ...\n", (*new)->title, basename);
-#endif
       if (*new != NULL)
        new = &(*new)->next;
     }
@@ -12978,7 +10562,7 @@ void LoadMusicInfo()
     num_music_noconf++;
   }
 
-  closedir(dir);
+  closeDirectory(dir);
 
   for (i = 0; i < num_sounds; i++)
   {
@@ -12994,10 +10578,6 @@ void LoadMusicInfo()
     if (!FileIsSound(sound->filename))
       continue;
 
-#if 0
-    printf("::: -> '%s' (configured)\n", sound->filename);
-#endif
-
     if (!sound_info_listed(music_file_info, sound->filename))
     {
       *new = get_sound_file_info(sound->filename, i);
@@ -13005,15 +10585,8 @@ void LoadMusicInfo()
        new = &(*new)->next;
     }
   }
-
-#if 0
-  for (next = music_file_info; next != NULL; next = next->next)
-    printf("::: title == '%s'\n", next->title);
-#endif
 }
 
-#endif
-
 void add_helpanim_entry(int element, int action, int direction, int delay,
                        int *num_list_entries)
 {
@@ -13327,15 +10900,15 @@ void ConvertLevels()
 
   convert_level_nr = convert_leveldir->first_level;
 
-  printf_line("=", 79);
-  printf("Converting levels\n");
-  printf_line("-", 79);
-  printf("Level series identifier: '%s'\n", convert_leveldir->identifier);
-  printf("Level series name:       '%s'\n", convert_leveldir->name);
-  printf("Level series author:     '%s'\n", convert_leveldir->author);
-  printf("Number of levels:        %d\n",   convert_leveldir->levels);
-  printf_line("=", 79);
-  printf("\n");
+  PrintLine("=", 79);
+  Print("Converting levels\n");
+  PrintLine("-", 79);
+  Print("Level series identifier: '%s'\n", convert_leveldir->identifier);
+  Print("Level series name:       '%s'\n", convert_leveldir->name);
+  Print("Level series author:     '%s'\n", convert_leveldir->author);
+  Print("Number of levels:        %d\n",   convert_leveldir->levels);
+  PrintLine("=", 79);
+  Print("\n");
 
   for (i = 0; i < MAX_NUM_CONVERT_LEVELS; i++)
     levels_failed[i] = FALSE;
@@ -13347,16 +10920,16 @@ void ConvertLevels()
 
     level_nr = convert_level_nr++;
 
-    printf("Level %03d: ", level_nr);
+    Print("Level %03d: ", level_nr);
 
     LoadLevel(level_nr);
-    if (level.no_valid_file)
+    if (level.no_level_file || level.no_valid_file)
     {
-      printf("(no level)\n");
+      Print("(no level)\n");
       continue;
     }
 
-    printf("converting level ... ");
+    Print("converting level ... ");
 
     level_filename = getDefaultLevelFilename(level_nr);
     new_level = !fileExists(level_filename);
@@ -13367,28 +10940,28 @@ void ConvertLevels()
 
       num_levels_converted++;
 
-      printf("converted.\n");
+      Print("converted.\n");
     }
     else
     {
       if (level_nr >= 0 && level_nr < MAX_NUM_CONVERT_LEVELS)
        levels_failed[level_nr] = TRUE;
 
-      printf("NOT CONVERTED -- LEVEL ALREADY EXISTS.\n");
+      Print("NOT CONVERTED -- LEVEL ALREADY EXISTS.\n");
     }
 
     num_levels_handled++;
   }
 
-  printf("\n");
-  printf_line("=", 79);
-  printf("Number of levels handled: %d\n", num_levels_handled);
-  printf("Number of levels converted: %d (%d%%)\n", num_levels_converted,
+  Print("\n");
+  PrintLine("=", 79);
+  Print("Number of levels handled: %d\n", num_levels_handled);
+  Print("Number of levels converted: %d (%d%%)\n", num_levels_converted,
         (num_levels_handled ?
          num_levels_converted * 100 / num_levels_handled : 0));
-  printf_line("-", 79);
-  printf("Summary (for automatic parsing by scripts):\n");
-  printf("LEVELDIR '%s', CONVERTED %d/%d (%d%%)",
+  PrintLine("-", 79);
+  Print("Summary (for automatic parsing by scripts):\n");
+  Print("LEVELDIR '%s', CONVERTED %d/%d (%d%%)",
         convert_leveldir->identifier, num_levels_converted,
         num_levels_handled,
         (num_levels_handled ?
@@ -13396,14 +10969,14 @@ void ConvertLevels()
 
   if (num_levels_handled != num_levels_converted)
   {
-    printf(", FAILED:");
+    Print(", FAILED:");
     for (i = 0; i < MAX_NUM_CONVERT_LEVELS; i++)
       if (levels_failed[i])
-       printf(" %03d", i);
+       Print(" %03d", i);
   }
 
-  printf("\n");
-  printf_line("=", 79);
+  Print("\n");
+  PrintLine("=", 79);
 
   CloseAllAndExit(0);
 }
@@ -13479,24 +11052,29 @@ void CreateLevelSketchImages()
 /* create and save images for custom and group elements (raw BMP format)     */
 /* ------------------------------------------------------------------------- */
 
-void CreateCustomElementImages()
+void CreateCustomElementImages(char *directory)
 {
 #if defined(TARGET_SDL)
-  char *filename = "graphics.classic/RocksCE.bmp";
-  Bitmap *bitmap;
+  char *src_basename = "RocksCE-template.ilbm";
+  char *dst_basename = "RocksCE.bmp";
+  char *src_filename = getPath2(directory, src_basename);
+  char *dst_filename = getPath2(directory, dst_basename);
   Bitmap *src_bitmap;
-  int dummy_graphic = IMG_CUSTOM_99;
+  Bitmap *bitmap;
   int yoffset_ce = 0;
   int yoffset_ge = (TILEY * NUM_CUSTOM_ELEMENTS / 16);
-  int src_x, src_y;
   int i;
 
+  SDLInitVideoDisplay();
+
+  ReCreateBitmap(&backbuffer, video.width, video.height);
+
+  src_bitmap = LoadImage(src_filename);
+
   bitmap = CreateBitmap(TILEX * 16 * 2,
                        TILEY * (NUM_CUSTOM_ELEMENTS + NUM_GROUP_ELEMENTS) / 16,
                        DEFAULT_DEPTH);
 
-  getFixedGraphicSource(dummy_graphic, 0, &src_bitmap, &src_x, &src_y);
-
   for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
     int x = i % 16;
@@ -13562,18 +11140,11 @@ void CreateCustomElementImages()
     }
   }
 
-  if (SDL_SaveBMP(bitmap->surface, filename) != 0)
-    Error(ERR_EXIT, "cannot save CE graphics file '%s'", filename);
+  if (SDL_SaveBMP(bitmap->surface, dst_filename) != 0)
+    Error(ERR_EXIT, "cannot save CE graphics file '%s'", dst_filename);
 
   FreeBitmap(bitmap);
 
   CloseAllAndExit(0);
 #endif
 }
-
-#if 0
-void CreateLevelSketchImages_TEST()
-{
-  void CreateCustomElementImages()
-}
-#endif