rnd-20030620-1-src
[rocksndiamonds.git] / src / files.c
index 000992012cb38657d255a7f4e9bdd9f6d34644fb..19f536d9f2498e18bdbe9ca11b36211757fb37ba 100644 (file)
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1995-2002 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  files.h                                                 *
+* files.c                                                  *
 ***********************************************************/
 
 #include <ctype.h>
-#include <dirent.h>
 #include <sys/stat.h>
-#include <unistd.h>
+
+#include "libgame/libgame.h"
 
 #include "files.h"
+#include "init.h"
 #include "tools.h"
-#include "misc.h"
 #include "tape.h"
-#include "joystick.h"
-
-#define MAX_FILENAME_LEN       256     /* maximal filename length */
-#define MAX_LINE_LEN           1000    /* maximal input line length */
-#define CHUNK_ID_LEN           4       /* IFF style chunk id length */
-#define LEVEL_HEADER_SIZE      80      /* size of level file header */
-#define LEVEL_HEADER_UNUSED    16      /* unused level header bytes */
-#define TAPE_HEADER_SIZE       20      /* size of tape file header */
-#define TAPE_HEADER_UNUSED     7       /* unused tape header bytes */
-#define FILE_VERSION_1_0       10      /* old 1.0 file version */
-#define FILE_VERSION_1_2       12      /* actual file version */
+
+
+#define CHUNK_ID_LEN           4       /* IFF style chunk id length  */
+#define CHUNK_SIZE_UNDEFINED   0       /* undefined chunk size == 0  */
+#define CHUNK_SIZE_NONE                -1      /* do not write chunk size    */
+#define FILE_VERS_CHUNK_SIZE   8       /* size of file version chunk */
+#define LEVEL_HEADER_SIZE      80      /* size of level file header  */
+#define LEVEL_HEADER_UNUSED    14      /* unused level header bytes  */
+#define LEVEL_CHUNK_CNT2_SIZE  160     /* size of level CNT2 chunk   */
+#define LEVEL_CHUNK_CNT2_UNUSED        11      /* unused CNT2 chunk bytes    */
+#define TAPE_HEADER_SIZE       20      /* size of tape file header   */
+#define TAPE_HEADER_UNUSED     3       /* unused tape header bytes   */
 
 /* file identifier strings */
-#define LEVEL_COOKIE           "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.2"
+#define LEVEL_COOKIE_TMPL      "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_x.x"
+#define TAPE_COOKIE_TMPL       "ROCKSNDIAMONDS_TAPE_FILE_VERSION_x.x"
 #define SCORE_COOKIE           "ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.2"
-#define TAPE_COOKIE            "ROCKSNDIAMONDS_TAPE_FILE_VERSION_1.2"
-#define SETUP_COOKIE           "ROCKSNDIAMONDS_SETUP_FILE_VERSION_1.2"
-#define LEVELSETUP_COOKIE      "ROCKSNDIAMONDS_LEVELSETUP_FILE_VERSION_1.2"
-#define LEVELINFO_COOKIE       "ROCKSNDIAMONDS_LEVELINFO_FILE_VERSION_1.2"
-/* old file identifiers for backward compatibility */
-#define LEVEL_COOKIE_10                "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.0"
-#define TAPE_COOKIE_10         "ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.0"
-
-/* file names and filename extensions */
-#ifndef MSDOS
-#define USERDATA_DIRECTORY     ".rocksndiamonds"
-#define SETUP_FILENAME         "setup.conf"
-#define LEVELSETUP_FILENAME    "levelsetup.conf"
-#define LEVELINFO_FILENAME     "levelinfo.conf"
-#define LEVELFILE_EXTENSION    "level"
-#define TAPEFILE_EXTENSION     "tape"
-#define SCOREFILE_EXTENSION    "score"
-#else
-#define USERDATA_DIRECTORY     "userdata"
-#define SETUP_FILENAME         "setup.cnf"
-#define LEVELSETUP_FILENAME    "lvlsetup.cnf"
-#define LEVELINFO_FILENAME     "lvlinfo.cnf"
-#define LEVELFILE_EXTENSION    "lvl"
-#define TAPEFILE_EXTENSION     "tap"
-#define SCOREFILE_EXTENSION    "sco"
-#define ERROR_FILENAME         "error.out"
-#endif
 
-/* file permissions for newly written files */
-#define MODE_R_ALL             (S_IRUSR | S_IRGRP | S_IROTH)
-#define MODE_W_ALL             (S_IWUSR | S_IWGRP | S_IWOTH)
-#define MODE_X_ALL             (S_IXUSR | S_IXGRP | S_IXOTH)
-#define USERDATA_DIR_MODE      (MODE_R_ALL | MODE_X_ALL | S_IWUSR)
-#define LEVEL_PERMS            (MODE_R_ALL | MODE_W_ALL)
-#define SCORE_PERMS            LEVEL_PERMS
-#define TAPE_PERMS             LEVEL_PERMS
-#define SETUP_PERMS            LEVEL_PERMS
-
-/* sort priorities of level series (also used as level series classes) */
-#define LEVELCLASS_TUTORIAL_START      10
-#define LEVELCLASS_TUTORIAL_END                99
-#define LEVELCLASS_CLASSICS_START      100
-#define LEVELCLASS_CLASSICS_END                199
-#define LEVELCLASS_CONTRIBUTION_START  200
-#define LEVELCLASS_CONTRIBUTION_END    299
-#define LEVELCLASS_USER_START          300
-#define LEVELCLASS_USER_END            399
-
-#define LEVELCLASS_TUTORIAL            LEVELCLASS_TUTORIAL_START
-#define LEVELCLASS_CLASSICS            LEVELCLASS_CLASSICS_START
-#define LEVELCLASS_CONTRIBUTION                LEVELCLASS_CONTRIBUTION_START
-#define LEVELCLASS_USER                        LEVELCLASS_USER_START
-#define LEVELCLASS_UNDEFINED           999
-
-#define IS_LEVELCLASS_TUTORIAL(n) \
-       (leveldir[n].sort_priority >= LEVELCLASS_TUTORIAL_START && \
-        leveldir[n].sort_priority <= LEVELCLASS_TUTORIAL_END)
-#define IS_LEVELCLASS_CLASSICS(n) \
-       (leveldir[n].sort_priority >= LEVELCLASS_CLASSICS_START && \
-        leveldir[n].sort_priority <= LEVELCLASS_CLASSICS_END)
-#define IS_LEVELCLASS_CONTRIBUTION(n) \
-       (leveldir[n].sort_priority >= LEVELCLASS_CONTRIBUTION_START && \
-        leveldir[n].sort_priority <= LEVELCLASS_CONTRIBUTION_END)
-#define IS_LEVELCLASS_USER(n) \
-       (leveldir[n].sort_priority >= LEVELCLASS_USER_START && \
-        leveldir[n].sort_priority <= LEVELCLASS_USER_END)
-
-#define LEVELCLASS(n)  (IS_LEVELCLASS_TUTORIAL(n) ? LEVELCLASS_TUTORIAL : \
-                        IS_LEVELCLASS_CLASSICS(n) ? LEVELCLASS_CLASSICS : \
-                        IS_LEVELCLASS_CONTRIBUTION(n) ? LEVELCLASS_CONTRIBUTION : \
-                        IS_LEVELCLASS_USER(n) ? LEVELCLASS_USER : \
-                        LEVELCLASS_UNDEFINED)
-
-#define LEVELCOLOR(n)  (IS_LEVELCLASS_TUTORIAL(n) ? FC_BLUE : \
-                        IS_LEVELCLASS_CLASSICS(n) ? FC_YELLOW : \
-                        IS_LEVELCLASS_CONTRIBUTION(n) ? FC_GREEN : \
-                        IS_LEVELCLASS_USER(n) ? FC_RED : FC_BLUE)
-
-static void SaveUserLevelInfo();               /* for 'InitUserLevelDir()' */
-static char *getSetupLine(char *, int);                /* for 'SaveUserLevelInfo()' */
-
-char *getUserDataDir()
+
+/* ========================================================================= */
+/* level file functions                                                      */
+/* ========================================================================= */
+
+static void setLevelInfoToDefaults()
 {
-  static char *userdata_dir = NULL;
+  int i, j, x, y;
 
-  if (!userdata_dir)
-  {
-    char *home_dir = getHomeDir();
-    char *data_dir = USERDATA_DIRECTORY;
+  level.file_version = FILE_VERSION_ACTUAL;
+  level.game_version = GAME_VERSION_ACTUAL;
 
-    userdata_dir = getPath2(home_dir, data_dir);
-  }
+  level.encoding_16bit_field = FALSE;  /* default: only 8-bit elements */
+  level.encoding_16bit_yamyam = FALSE; /* default: only 8-bit elements */
+  level.encoding_16bit_amoeba = FALSE; /* default: only 8-bit elements */
 
-  return userdata_dir;
-}
+  lev_fieldx = level.fieldx = STD_LEV_FIELDX;
+  lev_fieldy = level.fieldy = STD_LEV_FIELDY;
 
-static char *getSetupDir()
-{
-  return getUserDataDir();
-}
+  for(x=0; x<MAX_LEV_FIELDX; x++)
+    for(y=0; y<MAX_LEV_FIELDY; y++)
+      Feld[x][y] = Ur[x][y] = EL_SAND;
 
-static char *getUserLevelDir(char *level_subdir)
-{
-  static char *userlevel_dir = NULL;
-  char *data_dir = getUserDataDir();
-  char *userlevel_subdir = LEVELS_DIRECTORY;
+  level.time = 100;
+  level.gems_needed = 0;
+  level.amoeba_speed = 10;
+  level.time_magic_wall = 10;
+  level.time_wheel = 10;
+  level.time_light = 10;
+  level.time_timegate = 10;
+  level.amoeba_content = EL_DIAMOND;
+  level.double_speed = FALSE;
+  level.gravity = FALSE;
+  level.em_slippery_gems = FALSE;
 
-  if (userlevel_dir)
-    free(userlevel_dir);
+  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';
 
-  if (strlen(level_subdir) > 0)
-    userlevel_dir = getPath3(data_dir, userlevel_subdir, level_subdir);
-  else
-    userlevel_dir = getPath2(data_dir, userlevel_subdir);
+  strcpy(level.name, NAMELESS_LEVEL_NAME);
+  strcpy(level.author, ANONYMOUS_NAME);
 
-  return userlevel_dir;
-}
+  for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
+    level.score[i] = 10;
 
-static char *getTapeDir(char *level_subdir)
-{
-  static char *tape_dir = NULL;
-  char *data_dir = getUserDataDir();
-  char *tape_subdir = TAPES_DIRECTORY;
+  level.num_yamyam_contents = STD_ELEMENT_CONTENTS;
+  for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+    for(x=0; x<3; x++)
+      for(y=0; y<3; y++)
+       level.yamyam_content[i][x][y] =
+         (i < STD_ELEMENT_CONTENTS ? EL_ROCK : EL_EMPTY);
 
-  if (tape_dir)
-    free(tape_dir);
+  Feld[0][0] = Ur[0][0] = EL_PLAYER_1;
+  Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
+    Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_EXIT_CLOSED;
 
-  if (strlen(level_subdir) > 0)
-    tape_dir = getPath3(data_dir, tape_subdir, level_subdir);
-  else
-    tape_dir = getPath2(data_dir, tape_subdir);
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+  {
+    int element = EL_CUSTOM_START + i;
 
-  return tape_dir;
-}
+    element_info[element].use_gfx_element = FALSE;
+    element_info[element].gfx_element = EL_EMPTY_SPACE;
 
-static char *getScoreDir(char *level_subdir)
-{
-  static char *score_dir = NULL;
-  char *data_dir = options.rw_base_directory;
-  char *score_subdir = SCORES_DIRECTORY;
+    element_info[element].push_delay_fixed = 2;                /* special default */
+    element_info[element].push_delay_random = 8;       /* special default */
+    element_info[element].move_delay_fixed = 0;
+    element_info[element].move_delay_random = 0;
+
+    element_info[element].move_pattern = MV_ALL_DIRECTIONS;
+    element_info[element].move_direction_initial = MV_NO_MOVING;
+    element_info[element].move_stepsize = TILEX / 8;
+
+    for(x=0; x<3; x++)
+      for(y=0; y<3; y++)
+       element_info[element].content[x][y] = EL_EMPTY_SPACE;
 
-  if (score_dir)
-    free(score_dir);
+    element_info[element].change.events = CE_BITMASK_DEFAULT;
+    element_info[element].change.delay_fixed = 0;
+    element_info[element].change.delay_random = 0;
+    element_info[element].change.successor = EL_EMPTY_SPACE;
 
-  if (strlen(level_subdir) > 0)
-    score_dir = getPath3(data_dir, score_subdir, level_subdir);
+    /* start with no properties at all */
+    for (j=0; j < NUM_EP_BITFIELDS; j++)
+      Properties[element][j] = EP_BITMASK_DEFAULT;
+  }
+
+  BorderElement = EL_STEELWALL;
+
+  level.no_level_file = FALSE;
+
+  if (leveldir_current == NULL)                /* only when dumping level */
+    return;
+
+  /* try to determine better author name than 'anonymous' */
+  if (strcmp(leveldir_current->author, ANONYMOUS_NAME) != 0)
+  {
+    strncpy(level.author, leveldir_current->author, MAX_LEVEL_AUTHOR_LEN);
+    level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+  }
   else
-    score_dir = getPath2(data_dir, score_subdir);
+  {
+    switch (LEVELCLASS(leveldir_current))
+    {
+      case LEVELCLASS_TUTORIAL:
+       strcpy(level.author, PROGRAM_AUTHOR_STRING);
+       break;
+
+      case LEVELCLASS_CONTRIBUTION:
+       strncpy(level.author, leveldir_current->name,MAX_LEVEL_AUTHOR_LEN);
+       level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+       break;
+
+      case LEVELCLASS_USER:
+       strncpy(level.author, getRealName(), MAX_LEVEL_AUTHOR_LEN);
+       level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+       break;
 
-  return score_dir;
+      default:
+       /* keep default value */
+       break;
+    }
+  }
 }
 
-static char *getLevelFilename(int nr)
+static int checkLevelElement(int element)
 {
-  static char *filename = NULL;
-  char basename[MAX_FILENAME_LEN];
+  if (element >= NUM_FILE_ELEMENTS)
+  {
+    Error(ERR_WARN, "invalid level element %d", element);
+    element = EL_CHAR_QUESTION;
+  }
+  else if (element == EL_PLAYER_OBSOLETE)
+    element = EL_PLAYER_1;
+  else if (element == EL_KEY_OBSOLETE)
+    element = EL_KEY_1;
 
-  if (filename != NULL)
-    free(filename);
+  return element;
+}
 
-  sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION);
-  filename = getPath3((leveldir[leveldir_nr].user_defined ?
-                      getUserLevelDir("") :
-                      options.level_directory),
-                     leveldir[leveldir_nr].filename,
-                     basename);
+static int LoadLevel_VERS(FILE *file, int chunk_size, struct LevelInfo *level)
+{
+  level->file_version = getFileVersion(file);
+  level->game_version = getFileVersion(file);
 
-  return filename;
+  return chunk_size;
 }
 
-static char *getTapeFilename(int nr)
+static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level)
 {
-  static char *filename = NULL;
-  char basename[MAX_FILENAME_LEN];
+  int i, x, y;
 
-  if (filename != NULL)
-    free(filename);
+  lev_fieldx = level->fieldx = fgetc(file);
+  lev_fieldy = level->fieldy = fgetc(file);
 
-  sprintf(basename, "%03d.%s", nr, TAPEFILE_EXTENSION);
-  filename = getPath2(getTapeDir(leveldir[leveldir_nr].filename), basename);
+  level->time          = getFile16BitBE(file);
+  level->gems_needed   = getFile16BitBE(file);
 
-  return filename;
-}
+  for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
+    level->name[i] = fgetc(file);
+  level->name[MAX_LEVEL_NAME_LEN] = 0;
 
-static char *getScoreFilename(int nr)
-{
-  static char *filename = NULL;
-  char basename[MAX_FILENAME_LEN];
+  for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
+    level->score[i] = fgetc(file);
 
-  if (filename != NULL)
-    free(filename);
+  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][x][y] = checkLevelElement(fgetc(file));
 
-  sprintf(basename, "%03d.%s", nr, SCOREFILE_EXTENSION);
-  filename = getPath2(getScoreDir(leveldir[leveldir_nr].filename), basename);
+  level->amoeba_speed          = fgetc(file);
+  level->time_magic_wall       = fgetc(file);
+  level->time_wheel            = fgetc(file);
+  level->amoeba_content                = checkLevelElement(fgetc(file));
+  level->double_speed          = (fgetc(file) == 1 ? TRUE : FALSE);
+  level->gravity               = (fgetc(file) == 1 ? TRUE : FALSE);
+  level->encoding_16bit_field  = (fgetc(file) == 1 ? TRUE : FALSE);
+  level->em_slippery_gems      = (fgetc(file) == 1 ? TRUE : FALSE);
 
-  return filename;
-}
+  ReadUnusedBytesFromFile(file, LEVEL_HEADER_UNUSED);
 
-static void createDirectory(char *dir, char *text)
-{
-  if (access(dir, F_OK) != 0)
-    if (mkdir(dir, USERDATA_DIR_MODE) != 0)
-      Error(ERR_WARN, "cannot create %s directory '%s'", text, dir);
+  return chunk_size;
 }
 
-static void InitUserDataDirectory()
+static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level)
 {
-  createDirectory(getUserDataDir(), "user data");
-}
+  int i;
 
-static void InitTapeDirectory(char *level_subdir)
-{
-  createDirectory(getUserDataDir(), "user data");
-  createDirectory(getTapeDir(""), "main tape");
-  createDirectory(getTapeDir(level_subdir), "level tape");
-}
+  for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
+    level->author[i] = fgetc(file);
+  level->author[MAX_LEVEL_NAME_LEN] = 0;
 
-static void InitScoreDirectory(char *level_subdir)
-{
-  createDirectory(getScoreDir(""), "main score");
-  createDirectory(getScoreDir(level_subdir), "level score");
+  return chunk_size;
 }
 
-static void InitUserLevelDirectory(char *level_subdir)
+static int LoadLevel_BODY(FILE *file, int chunk_size, struct LevelInfo *level)
 {
-  if (access(getUserLevelDir(level_subdir), F_OK) != 0)
-  {
-    createDirectory(getUserDataDir(), "user data");
-    createDirectory(getUserLevelDir(""), "main user level");
-    createDirectory(getUserLevelDir(level_subdir), "user level");
+  int x, y;
+  int chunk_size_expected = level->fieldx * level->fieldy;
+
+  /* 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. */
 
-    SaveUserLevelInfo();
+  if (level->encoding_16bit_field && level->file_version >= FILE_VERSION_2_0)
+    chunk_size_expected *= 2;
+
+  if (chunk_size_expected != chunk_size)
+  {
+    ReadUnusedBytesFromFile(file, chunk_size);
+    return chunk_size_expected;
   }
+
+  for(y=0; y<level->fieldy; y++)
+    for(x=0; x<level->fieldx; x++)
+      Feld[x][y] = Ur[x][y] =
+       checkLevelElement(level->encoding_16bit_field ?
+                         getFile16BitBE(file) : fgetc(file));
+  return chunk_size;
 }
 
-static void setLevelInfoToDefaults()
+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;
 
-  lev_fieldx = level.fieldx = STD_LEV_FIELDX;
-  lev_fieldy = level.fieldy = STD_LEV_FIELDY;
+  /* 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. */
 
-  for(x=0; x<MAX_LEV_FIELDX; x++)
-    for(y=0; y<MAX_LEV_FIELDY; y++)
-      Feld[x][y] = Ur[x][y] = EL_ERDREICH;
+  if (level->encoding_16bit_field && level->file_version >= FILE_VERSION_2_0)
+    chunk_size_expected += content_size;
 
-  level.time = 100;
-  level.gems_needed = 0;
-  level.amoeba_speed = 10;
-  level.time_magic_wall = 10;
-  level.time_wheel = 10;
-  level.amoeba_content = EL_DIAMANT;
-  level.double_speed = FALSE;
-  level.gravity = FALSE;
+  if (chunk_size_expected != chunk_size)
+  {
+    ReadUnusedBytesFromFile(file, chunk_size);
+    return chunk_size_expected;
+  }
 
-  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';
+  fgetc(file);
+  level->num_yamyam_contents = fgetc(file);
+  fgetc(file);
+  fgetc(file);
 
-  strcpy(level.name, NAMELESS_LEVEL_NAME);
-  strcpy(level.author, ANONYMOUS_NAME);
+  /* 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<LEVEL_SCORE_ELEMENTS; i++)
-    level.score[i] = 10;
+  for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+       level->yamyam_content[i][x][y] =
+         checkLevelElement(level->encoding_16bit_field ?
+                           getFile16BitBE(file) : fgetc(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, content_xsize, content_ysize;
+  int content_array[MAX_ELEMENT_CONTENTS][3][3];
+
+  element = checkLevelElement(getFile16BitBE(file));
+  num_contents = fgetc(file);
+  content_xsize = fgetc(file);
+  content_ysize = fgetc(file);
+  ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT2_UNUSED);
 
-  level.num_yam_contents = STD_ELEMENT_CONTENTS;
   for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
-    for(x=0; x<3; x++)
-      for(y=0; y<3; y++)
-       level.yam_content[i][x][y] = EL_FELSBROCKEN;
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+       content_array[i][x][y] = checkLevelElement(getFile16BitBE(file));
 
-  Feld[0][0] = Ur[0][0] = EL_SPIELFIGUR;
-  Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
-    Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_AUSGANG_ZU;
+  /* correct invalid number of content fields -- should never happen */
+  if (num_contents < 1 || num_contents > MAX_ELEMENT_CONTENTS)
+    num_contents = STD_ELEMENT_CONTENTS;
 
-  BorderElement = EL_BETON;
+  if (element == EL_YAMYAM)
+  {
+    level->num_yamyam_contents = num_contents;
 
-  /* try to determine better author name than 'anonymous' */
-  if (strcmp(leveldir[leveldir_nr].author, ANONYMOUS_NAME) != 0)
+    for(i=0; i<num_contents; i++)
+      for(y=0; y<3; y++)
+       for(x=0; x<3; x++)
+         level->yamyam_content[i][x][y] = content_array[i][x][y];
+  }
+  else if (element == EL_BD_AMOEBA)
   {
-    strncpy(level.author, leveldir[leveldir_nr].author, MAX_LEVEL_AUTHOR_LEN);
-    level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+    level->amoeba_content = content_array[0][0][0];
   }
   else
   {
-    switch (LEVELCLASS(leveldir_nr))
-    {
-      case LEVELCLASS_TUTORIAL:
-       strcpy(level.author, PROGRAM_AUTHOR_STRING);
-       break;
+    Error(ERR_WARN, "cannot load content for element '%d'", element);
+  }
 
-      case LEVELCLASS_CONTRIBUTION:
-       strncpy(level.author, leveldir[leveldir_nr].name,MAX_LEVEL_AUTHOR_LEN);
-       level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
-       break;
+  return chunk_size;
+}
 
-      case LEVELCLASS_USER:
-       strncpy(level.author, getRealName(), MAX_LEVEL_AUTHOR_LEN);
-       level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
-       break;
+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;
 
-      default:
-       /* keep default value */
-       break;
-    }
+  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 = getFile16BitBE(file);
+    int properties = getFile32BitBE(file);
+
+    if (IS_CUSTOM_ELEMENT(element))
+      Properties[element][EP_BITFIELD_BASE] = properties;
+    else
+      Error(ERR_WARN, "invalid custom element number %d", element);
   }
+
+  return chunk_size;
 }
 
-void LoadLevel(int level_nr)
+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 = getFile16BitBE(file);
+    int custom_element_successor = getFile16BitBE(file);
+
+    if (IS_CUSTOM_ELEMENT(element))
+      element_info[element].change.successor = custom_element_successor;
+    else
+      Error(ERR_WARN, "invalid custom element number %d", element);
+  }
+
+  return chunk_size;
+}
+
+void LoadLevelFromFilename(char *filename)
 {
-  int i, x, y;
-  char *filename = getLevelFilename(level_nr);
   char cookie[MAX_LINE_LEN];
-  char chunk[CHUNK_ID_LEN + 1];
-  int file_version = FILE_VERSION_1_2; /* last version of level files */
-  int chunk_length;
+  char chunk_name[CHUNK_ID_LEN + 1];
+  int chunk_size;
   FILE *file;
 
   /* always start with reliable default values */
   setLevelInfoToDefaults();
 
-  if (!(file = fopen(filename, "r")))
+  if (!(file = fopen(filename, MODE_READ)))
   {
+    level.no_level_file = TRUE;
+
     Error(ERR_WARN, "cannot read level '%s' - creating new level", filename);
     return;
   }
 
-  /* check file identifier */
-  fgets(cookie, MAX_LINE_LEN, file);
-  if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
-    cookie[strlen(cookie) - 1] = '\0';
+  getFileChunkBE(file, chunk_name, NULL);
+  if (strcmp(chunk_name, "RND1") == 0)
+  {
+    getFile32BitBE(file);              /* not used */
 
-  if (strcmp(cookie, LEVEL_COOKIE_10) == 0)    /* old 1.0 level format */
-    file_version = FILE_VERSION_1_0;
-  else if (strcmp(cookie, LEVEL_COOKIE) != 0)  /* unknown level format */
+    getFileChunkBE(file, chunk_name, NULL);
+    if (strcmp(chunk_name, "CAVE") != 0)
+    {
+      Error(ERR_WARN, "unknown format of level file '%s'", filename);
+      fclose(file);
+      return;
+    }
+  }
+  else /* check for pre-2.0 file format with cookie string */
   {
-    Error(ERR_WARN, "wrong file identifier of level file '%s'", filename);
-    fclose(file);
+    strcpy(cookie, chunk_name);
+    fgets(&cookie[4], MAX_LINE_LEN - 4, file);
+    if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
+      cookie[strlen(cookie) - 1] = '\0';
+
+    if (!checkCookieString(cookie, LEVEL_COOKIE_TMPL))
+    {
+      Error(ERR_WARN, "unknown format of level file '%s'", filename);
+      fclose(file);
+      return;
+    }
+
+    if ((level.file_version = getFileVersionFromCookieString(cookie)) == -1)
+    {
+      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_HEADER_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", FILE_VERS_CHUNK_SIZE,  LoadLevel_VERS },
+      { "HEAD", LEVEL_HEADER_SIZE,     LoadLevel_HEAD },
+      { "AUTH", MAX_LEVEL_AUTHOR_LEN,  LoadLevel_AUTH },
+      { "BODY", -1,                    LoadLevel_BODY },
+      { "CONT", -1,                    LoadLevel_CONT },
+      { "CNT2", LEVEL_CHUNK_CNT2_SIZE, LoadLevel_CNT2 },
+      { "CUS1", -1,                    LoadLevel_CUS1 },
+      { "CUS2", -1,                    LoadLevel_CUS2 },
+      {  NULL,  0,                     NULL }
+    };
+
+    while (getFileChunkBE(file, chunk_name, &chunk_size))
+    {
+      int i = 0;
+
+      while (chunk_info[i].name != NULL &&
+            strcmp(chunk_name, chunk_info[i].name) != 0)
+       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);
+
+  if (leveldir_current == NULL)                /* only when dumping level */
     return;
+
+  if (IS_LEVELCLASS_CONTRIBUTION(leveldir_current) ||
+      IS_LEVELCLASS_USER(leveldir_current))
+  {
+    /* For user contributed and private levels, use the version of
+       the game engine the levels were created for.
+       Since 2.0.1, the game engine version is now directly stored
+       in the level file (chunk "VERS"), so there is no need anymore
+       to set the game version from the file version (except for old,
+       pre-2.0 levels, where the game version is still taken from the
+       file format version used to store the level -- see above). */
+
+    /* do some special adjustments to support older level versions */
+    if (level.file_version == FILE_VERSION_1_0)
+    {
+      Error(ERR_WARN, "level file '%s' has version number 1.0", filename);
+      Error(ERR_WARN, "using high speed movement for player");
+
+      /* player was faster than monsters in (pre-)1.0 levels */
+      level.double_speed = TRUE;
+    }
+
+    /* Default behaviour for EM style gems was "slippery" only in 2.0.1 */
+    if (level.game_version == VERSION_IDENT(2,0,1))
+      level.em_slippery_gems = TRUE;
+  }
+  else
+  {
+    /* Always use the latest version of the game engine for all but
+       user contributed and private levels; this allows for actual
+       corrections in the game engine to take effect for existing,
+       converted levels (from "classic" or other existing games) to
+       make the game emulation more accurate, while (hopefully) not
+       breaking existing levels created from other players. */
+
+    level.game_version = GAME_VERSION_ACTUAL;
+
+    /* Set special EM style gems behaviour: EM style gems slip down from
+       normal, steel and growing wall. As this is a more fundamental change,
+       it seems better to set the default behaviour to "off" (as it is more
+       natural) and make it configurable in the level editor (as a property
+       of gem style elements). Already existing converted levels (neither
+       private nor contributed levels) are changed to the new behaviour. */
+
+    if (level.file_version < FILE_VERSION_2_0)
+      level.em_slippery_gems = TRUE;
   }
 
-  /* read chunk "HEAD" */
-  if (file_version >= FILE_VERSION_1_2)
+  /* map some elements which have changed in newer versions */
+  if (level.game_version <= VERSION_IDENT(2,2,0))
   {
-    getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
-    if (strcmp(chunk, "HEAD") || chunk_length != LEVEL_HEADER_SIZE)
+    int x, y;
+
+    /* map game font elements */
+    for(y=0; y<level.fieldy; y++)
     {
-      Error(ERR_WARN, "wrong 'HEAD' chunk of level file '%s'", filename);
-      fclose(file);
-      return;
+      for(x=0; x<level.fieldx; x++)
+      {
+       int element = Ur[x][y];
+
+       if (element == EL_CHAR('['))
+         element = EL_CHAR_AUMLAUT;
+       else if (element == EL_CHAR('\\'))
+         element = EL_CHAR_OUMLAUT;
+       else if (element == EL_CHAR(']'))
+         element = EL_CHAR_UUMLAUT;
+       else if (element == EL_CHAR('^'))
+         element = EL_CHAR_COPYRIGHT;
+
+       Feld[x][y] = Ur[x][y] = element;
+      }
     }
   }
 
-  lev_fieldx = level.fieldx = fgetc(file);
-  lev_fieldy = level.fieldy = fgetc(file);
+  /* determine border element for this level */
+  SetBorderElement();
+}
 
-  level.time        = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
-  level.gems_needed = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
+void LoadLevel(int level_nr)
+{
+  char *filename = getLevelFilename(level_nr);
+
+  LoadLevelFromFilename(filename);
+  InitElementPropertiesEngine(level.game_version);
+}
+
+static void SaveLevel_VERS(FILE *file, struct LevelInfo *level)
+{
+  putFileVersion(file, level->file_version);
+  putFileVersion(file, level->game_version);
+}
+
+static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level)
+{
+  int i, x, y;
+
+  fputc(level->fieldx, file);
+  fputc(level->fieldy, file);
+
+  putFile16BitBE(file, level->time);
+  putFile16BitBE(file, level->gems_needed);
 
   for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
-    level.name[i] = fgetc(file);
-  level.name[MAX_LEVEL_NAME_LEN] = 0;
+    fputc(level->name[i], file);
 
   for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
-    level.score[i] = fgetc(file);
+    fputc(level->score[i], file);
+
+  for(i=0; i<STD_ELEMENT_CONTENTS; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+       fputc((level->encoding_16bit_yamyam ? EL_EMPTY :
+              level->yamyam_content[i][x][y]),
+             file);
+  fputc(level->amoeba_speed, file);
+  fputc(level->time_magic_wall, file);
+  fputc(level->time_wheel, file);
+  fputc((level->encoding_16bit_amoeba ? EL_EMPTY : level->amoeba_content),
+       file);
+  fputc((level->double_speed ? 1 : 0), file);
+  fputc((level->gravity ? 1 : 0), file);
+  fputc((level->encoding_16bit_field ? 1 : 0), file);
+  fputc((level->em_slippery_gems ? 1 : 0), file);
+
+  WriteUnusedBytesToFile(file, LEVEL_HEADER_UNUSED);
+}
+
+static void SaveLevel_AUTH(FILE *file, struct LevelInfo *level)
+{
+  int i;
+
+  for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
+    fputc(level->author[i], file);
+}
+
+static void SaveLevel_BODY(FILE *file, struct LevelInfo *level)
+{
+  int x, y;
+
+  for(y=0; y<level->fieldy; y++) 
+    for(x=0; x<level->fieldx; x++) 
+      if (level->encoding_16bit_field)
+       putFile16BitBE(file, Ur[x][y]);
+      else
+       fputc(Ur[x][y], file);
+}
+
+#if 0
+static void SaveLevel_CONT(FILE *file, struct LevelInfo *level)
+{
+  int i, x, y;
+
+  fputc(EL_YAMYAM, file);
+  fputc(level->num_yamyam_contents, file);
+  fputc(0, file);
+  fputc(0, file);
 
-  level.num_yam_contents = STD_ELEMENT_CONTENTS;
   for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
-  {
     for(y=0; y<3; y++)
-    {
       for(x=0; x<3; x++)
-      {
-       if (i < STD_ELEMENT_CONTENTS)
-         level.yam_content[i][x][y] = fgetc(file);
+       if (level->encoding_16bit_field)
+         putFile16BitBE(file, level->yamyam_content[i][x][y]);
        else
-         level.yam_content[i][x][y] = EL_LEERRAUM;
-      }
-    }
-  }
+         fputc(level->yamyam_content[i][x][y], file);
+}
+#endif
 
-  level.amoeba_speed   = fgetc(file);
-  level.time_magic_wall        = fgetc(file);
-  level.time_wheel     = fgetc(file);
-  level.amoeba_content = fgetc(file);
-  level.double_speed   = (fgetc(file) == 1 ? TRUE : FALSE);
-  level.gravity                = (fgetc(file) == 1 ? TRUE : FALSE);
+static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
+{
+  int i, x, y;
+  int num_contents, content_xsize, content_ysize;
+  int content_array[MAX_ELEMENT_CONTENTS][3][3];
 
-  for(i=0; i<LEVEL_HEADER_UNUSED; i++) /* skip unused header bytes */
-    fgetc(file);
+  if (element == EL_YAMYAM)
+  {
+    num_contents = level->num_yamyam_contents;
+    content_xsize = 3;
+    content_ysize = 3;
 
-  /* read chunk "BODY" */
-  if (file_version >= FILE_VERSION_1_2)
+    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] = level->yamyam_content[i][x][y];
+  }
+  else if (element == EL_BD_AMOEBA)
   {
-    getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
+    num_contents = 1;
+    content_xsize = 1;
+    content_ysize = 1;
 
-    /* look for optional author chunk */
-    if (strcmp(chunk, "AUTH") == 0 && chunk_length == MAX_LEVEL_AUTHOR_LEN)
-    {
-      for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
-       level.author[i] = fgetc(file);
-      level.author[MAX_LEVEL_NAME_LEN] = 0;
+    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] = EL_EMPTY;
+    content_array[0][0][0] = level->amoeba_content;
+  }
+  else
+  {
+    /* chunk header already written -- write empty chunk data */
+    WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_SIZE);
 
-      getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
-    }
+    Error(ERR_WARN, "cannot save content for element '%d'", element);
+    return;
+  }
 
-    /* look for optional content chunk */
-    if (strcmp(chunk, "CONT") == 0 &&
-       chunk_length == 4 + MAX_ELEMENT_CONTENTS * 3 * 3)
-    {
-      fgetc(file);
-      level.num_yam_contents = fgetc(file);
-      fgetc(file);
-      fgetc(file);
+  putFile16BitBE(file, element);
+  fputc(num_contents, file);
+  fputc(content_xsize, file);
+  fputc(content_ysize, file);
 
-      for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
-       for(y=0; y<3; y++)
-         for(x=0; x<3; x++)
-           level.yam_content[i][x][y] = fgetc(file);
+  WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_UNUSED);
 
-      getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
-    }
+  for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+       putFile16BitBE(file, content_array[i][x][y]);
+}
+
+static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level,
+                          int num_changed_custom_elements)
+{
+  int i, check = 0;
+
+  putFile16BitBE(file, num_changed_custom_elements);
 
-    /* next check body chunk identifier and chunk length */
-    if (strcmp(chunk, "BODY") || chunk_length != lev_fieldx * lev_fieldy)
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+  {
+    int element = EL_CUSTOM_START + i;
+
+    if (Properties[element][EP_BITFIELD_BASE] != EP_BITMASK_DEFAULT)
     {
-      Error(ERR_WARN, "wrong 'BODY' chunk of level file '%s'", filename);
-      fclose(file);
-      return;
+      if (check < num_changed_custom_elements)
+      {
+       putFile16BitBE(file, element);
+       putFile32BitBE(file, Properties[element][EP_BITFIELD_BASE]);
+      }
+
+      check++;
     }
   }
 
-  /* clear all other level fields (needed if resized in level editor later) */
-  for(x=0; x<MAX_LEV_FIELDX; x++)
-    for(y=0; y<MAX_LEV_FIELDY; y++)
-      Feld[x][y] = Ur[x][y] = EL_LEERRAUM;
+  if (check != num_changed_custom_elements)    /* should not happen */
+    Error(ERR_WARN, "inconsistent number of custom element properties");
+}
 
-  /* now read in the valid level fields from level file */
-  for(y=0; y<lev_fieldy; y++)
-    for(x=0; x<lev_fieldx; x++)
-      Feld[x][y] = Ur[x][y] = fgetc(file);
+static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level,
+                          int num_changed_custom_elements)
+{
+  int i, check = 0;
 
-  fclose(file);
+  putFile16BitBE(file, num_changed_custom_elements);
 
-  /* player was faster than monsters in pre-1.0 levels */
-  if (file_version == FILE_VERSION_1_0 &&
-      IS_LEVELCLASS_CONTRIBUTION(leveldir_nr))
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
-    Error(ERR_WARN, "level file '%s' has version number 1.0", filename);
-    Error(ERR_WARN, "using high speed movement for player");
-    level.double_speed = TRUE;
+    int element = EL_CUSTOM_START + i;
+
+    if (element_info[element].change.successor != EL_EMPTY_SPACE)
+    {
+      if (check < num_changed_custom_elements)
+      {
+       putFile16BitBE(file, element);
+       putFile16BitBE(file, element_info[element].change.successor);
+      }
+
+      check++;
+    }
   }
 
-  /* determine border element for this level */
-  SetBorderElement();
+  if (check != num_changed_custom_elements)    /* should not happen */
+    Error(ERR_WARN, "inconsistent number of custom element successors");
 }
 
 void SaveLevel(int level_nr)
 {
-  int i, x, y;
   char *filename = getLevelFilename(level_nr);
+  int body_chunk_size;
+  int num_changed_custom_elements1 = 0;
+  int num_changed_custom_elements2 = 0;
+  int i, x, y;
   FILE *file;
 
-  if (!(file = fopen(filename, "w")))
+  if (!(file = fopen(filename, MODE_WRITE)))
   {
     Error(ERR_WARN, "cannot save level file '%s'", filename);
     return;
   }
 
-  fputs(LEVEL_COOKIE, file);           /* file identifier */
-  fputc('\n', file);
-
-  putFileChunk(file, "HEAD", LEVEL_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN);
-
-  fputc(level.fieldx, file);
-  fputc(level.fieldy, file);
+  level.file_version = FILE_VERSION_ACTUAL;
+  level.game_version = GAME_VERSION_ACTUAL;
 
-  putFile16BitInteger(file, level.time, BYTE_ORDER_BIG_ENDIAN);
-  putFile16BitInteger(file, level.gems_needed, BYTE_ORDER_BIG_ENDIAN);
+  /* check level field for 16-bit elements */
+  level.encoding_16bit_field = FALSE;
+  for(y=0; y<level.fieldy; y++) 
+    for(x=0; x<level.fieldx; x++) 
+      if (Ur[x][y] > 255)
+       level.encoding_16bit_field = TRUE;
 
-  for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
-    fputc(level.name[i], file);
-  for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
-    fputc(level.score[i], file);
-  for(i=0; i<STD_ELEMENT_CONTENTS; i++)
+  /* check yamyam content for 16-bit elements */
+  level.encoding_16bit_yamyam = FALSE;
+  for(i=0; i<level.num_yamyam_contents; i++)
     for(y=0; y<3; y++)
       for(x=0; x<3; x++)
-       fputc(level.yam_content[i][x][y], file);
-  fputc(level.amoeba_speed, file);
-  fputc(level.time_magic_wall, file);
-  fputc(level.time_wheel, file);
-  fputc(level.amoeba_content, file);
-  fputc((level.double_speed ? 1 : 0), file);
-  fputc((level.gravity ? 1 : 0), file);
+       if (level.yamyam_content[i][x][y] > 255)
+         level.encoding_16bit_yamyam = TRUE;
 
-  for(i=0; i<LEVEL_HEADER_UNUSED; i++) /* set unused header bytes to zero */
-    fputc(0, file);
+  /* check amoeba content for 16-bit elements */
+  level.encoding_16bit_amoeba = FALSE;
+  if (level.amoeba_content > 255)
+    level.encoding_16bit_amoeba = TRUE;
 
-  putFileChunk(file, "AUTH", MAX_LEVEL_AUTHOR_LEN, BYTE_ORDER_BIG_ENDIAN);
+  /* calculate size of "BODY" chunk */
+  body_chunk_size =
+    level.fieldx * level.fieldy * (level.encoding_16bit_field ? 2 : 1);
 
-  for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
-    fputc(level.author[i], file);
+  /* check for non-standard custom elements and calculate "CUS1" chunk size */
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+    if (Properties[EL_CUSTOM_START +i][EP_BITFIELD_BASE] != EP_BITMASK_DEFAULT)
+      num_changed_custom_elements1++;
 
-  putFileChunk(file, "CONT", 4 + MAX_ELEMENT_CONTENTS * 3 * 3,
-              BYTE_ORDER_BIG_ENDIAN);
+  /* check for non-standard custom elements and calculate "CUS2" chunk size */
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+    if (element_info[EL_CUSTOM_START + i].change.successor != EL_EMPTY_SPACE)
+      num_changed_custom_elements2++;
 
-  fputc(EL_MAMPFER, file);
-  fputc(level.num_yam_contents, file);
-  fputc(0, file);
-  fputc(0, file);
+  putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED);
+  putFileChunkBE(file, "CAVE", CHUNK_SIZE_NONE);
 
-  for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
-    for(y=0; y<3; y++)
-      for(x=0; x<3; x++)
-       fputc(level.yam_content[i][x][y], file);
+  putFileChunkBE(file, "VERS", FILE_VERS_CHUNK_SIZE);
+  SaveLevel_VERS(file, &level);
+
+  putFileChunkBE(file, "HEAD", LEVEL_HEADER_SIZE);
+  SaveLevel_HEAD(file, &level);
+
+  putFileChunkBE(file, "AUTH", MAX_LEVEL_AUTHOR_LEN);
+  SaveLevel_AUTH(file, &level);
 
-  putFileChunk(file, "BODY", lev_fieldx * lev_fieldy, BYTE_ORDER_BIG_ENDIAN);
+  putFileChunkBE(file, "BODY", body_chunk_size);
+  SaveLevel_BODY(file, &level);
 
-  for(y=0; y<lev_fieldy; y++) 
-    for(x=0; x<lev_fieldx; x++) 
-      fputc(Ur[x][y], file);
+  if (level.encoding_16bit_yamyam ||
+      level.num_yamyam_contents != STD_ELEMENT_CONTENTS)
+  {
+    putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE);
+    SaveLevel_CNT2(file, &level, EL_YAMYAM);
+  }
+
+  if (level.encoding_16bit_amoeba)
+  {
+    putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE);
+    SaveLevel_CNT2(file, &level, EL_BD_AMOEBA);
+  }
+
+  if (num_changed_custom_elements1 > 0)
+  {
+    putFileChunkBE(file, "CUS1", 2 + num_changed_custom_elements1 * 6);
+    SaveLevel_CUS1(file, &level, num_changed_custom_elements1);
+  }
+
+  if (num_changed_custom_elements2 > 0)
+  {
+    putFileChunkBE(file, "CUS2", 2 + num_changed_custom_elements2 * 4);
+    SaveLevel_CUS2(file, &level, num_changed_custom_elements2);
+  }
 
   fclose(file);
 
-  chmod(filename, LEVEL_PERMS);
+  SetFilePermissions(filename, PERMS_PRIVATE);
 }
 
-void LoadTape(int level_nr)
+void DumpLevel(struct LevelInfo *level)
 {
-  int i, j;
-  char *filename = getTapeFilename(level_nr);
-  char cookie[MAX_LINE_LEN];
-  char chunk[CHUNK_ID_LEN + 1];
-  FILE *file;
-  int num_participating_players;
-  int file_version = FILE_VERSION_1_2; /* last version of tape files */
-  int chunk_length;
+  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("Gravity:                %s\n", (level->gravity ? "yes" : "no"));
+  printf("Double Speed Movement:  %s\n", (level->double_speed ? "yes" : "no"));
+  printf("EM style slippery gems: %s\n", (level->em_slippery_gems ? "yes" : "no"));
+
+  printf_line("-", 79);
+}
+
+
+/* ========================================================================= */
+/* tape file functions                                                       */
+/* ========================================================================= */
+
+static void setTapeInfoToDefaults()
+{
+  int i;
 
   /* always start with reliable default values (empty tape) */
   TapeErase();
@@ -583,115 +938,125 @@ void LoadTape(int level_nr)
     tape.player_participates[i] = FALSE;
 
   /* at least one (default: the first) player participates in every tape */
-  num_participating_players = 1;
+  tape.num_participating_players = 1;
 
-  if (!(file = fopen(filename, "r")))
-    return;
+  tape.level_nr = level_nr;
+  tape.counter = 0;
+  tape.changed = FALSE;
 
-  /* check file identifier */
-  fgets(cookie, MAX_LINE_LEN, file);
-  if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
-    cookie[strlen(cookie) - 1] = '\0';
+  tape.recording = FALSE;
+  tape.playing = FALSE;
+  tape.pausing = FALSE;
+}
 
-  if (strcmp(cookie, TAPE_COOKIE_10) == 0)     /* old 1.0 tape format */
-    file_version = FILE_VERSION_1_0;
-  else if (strcmp(cookie, TAPE_COOKIE) != 0)   /* unknown tape format */
-  {
-    Error(ERR_WARN, "wrong file identifier of tape file '%s'", filename);
-    fclose(file);
-    return;
-  }
+static int LoadTape_VERS(FILE *file, int chunk_size, struct TapeInfo *tape)
+{
+  tape->file_version = getFileVersion(file);
+  tape->game_version = getFileVersion(file);
 
-  /* read chunk "HEAD" */
-  if (file_version >= FILE_VERSION_1_2)
-  {
-    getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
-    if (strcmp(chunk, "HEAD") || chunk_length != TAPE_HEADER_SIZE)
-    {
-      Error(ERR_WARN, "wrong 'HEAD' chunk of tape file '%s'", filename);
-      fclose(file);
-      return;
-    }
-  }
+  return chunk_size;
+}
+
+static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape)
+{
+  int i;
 
-  tape.random_seed = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
-  tape.date        = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
-  tape.length      = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
+  tape->random_seed = getFile32BitBE(file);
+  tape->date        = getFile32BitBE(file);
+  tape->length      = getFile32BitBE(file);
 
   /* read header fields that are new since version 1.2 */
-  if (file_version >= FILE_VERSION_1_2)
+  if (tape->file_version >= FILE_VERSION_1_2)
   {
     byte store_participating_players = fgetc(file);
-
-    for(i=0; i<TAPE_HEADER_UNUSED; i++)                /* skip unused header bytes */
-      fgetc(file);
+    int engine_version;
 
     /* since version 1.2, tapes store which players participate in the tape */
-    num_participating_players = 0;
+    tape->num_participating_players = 0;
     for(i=0; i<MAX_PLAYERS; i++)
     {
-      tape.player_participates[i] = FALSE;
+      tape->player_participates[i] = FALSE;
 
       if (store_participating_players & (1 << i))
       {
-       tape.player_participates[i] = TRUE;
-       num_participating_players++;
+       tape->player_participates[i] = TRUE;
+       tape->num_participating_players++;
       }
     }
+
+    ReadUnusedBytesFromFile(file, TAPE_HEADER_UNUSED);
+
+    engine_version = getFileVersion(file);
+    if (engine_version > 0)
+      tape->engine_version = engine_version;
   }
 
-  tape.level_nr = level_nr;
-  tape.counter = 0;
-  tape.changed = FALSE;
+  return chunk_size;
+}
 
-  tape.recording = FALSE;
-  tape.playing = FALSE;
-  tape.pausing = FALSE;
+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);
 
-  /* read chunk "BODY" */
-  if (file_version >= FILE_VERSION_1_2)
+  for(i=0; i < level_identifier_size; i++)
+    tape->level_identifier[i] = fgetc(file);
+
+  tape->level_nr = getFile16BitBE(file);
+
+  chunk_size = 2 + level_identifier_size + 2;
+
+  return chunk_size;
+}
+
+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)
   {
-    getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
-    if (strcmp(chunk, "BODY") ||
-       chunk_length != (num_participating_players + 1) * tape.length)
-    {
-      Error(ERR_WARN, "wrong 'BODY' chunk of tape file '%s'", filename);
-      fclose(file);
-      return;
-    }
+    ReadUnusedBytesFromFile(file, chunk_size);
+    return chunk_size_expected;
   }
 
-  for(i=0; i<tape.length; i++)
+  for(i=0; i<tape->length; i++)
   {
     if (i >= MAX_TAPELEN)
       break;
 
     for(j=0; j<MAX_PLAYERS; j++)
     {
-      tape.pos[i].action[j] = MV_NO_MOVING;
+      tape->pos[i].action[j] = MV_NO_MOVING;
 
-      if (tape.player_participates[j])
-       tape.pos[i].action[j] = fgetc(file);
+      if (tape->player_participates[j])
+       tape->pos[i].action[j] = fgetc(file);
     }
 
-    tape.pos[i].delay = fgetc(file);
+    tape->pos[i].delay = fgetc(file);
 
-    if (file_version == FILE_VERSION_1_0)
+    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];
+      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];
+         tape->pos[i + num_moves].action[0] = joy_dir[k];
          if (num_moves > 0)
-           tape.pos[i + num_moves].delay = 0;
+           tape->pos[i + num_moves].delay = 0;
          num_moves++;
        }
       }
@@ -700,7 +1065,26 @@ void LoadTape(int level_nr)
       {
        num_moves--;
        i += num_moves;
-       tape.length += 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;
+
+       /* delay part */
+       for(j=0; j<MAX_PLAYERS; j++)
+         tape->pos[i].action[j] = MV_NO_MOVING;
+       tape->pos[i].delay--;
+
+       i++;
+       tape->length++;
       }
     }
 
@@ -708,24 +1092,207 @@ void LoadTape(int level_nr)
       break;
   }
 
-  fclose(file);
+  if (i != tape->length)
+    chunk_size = (tape->num_participating_players + 1) * i;
+
+  return chunk_size;
+}
+
+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 (!(file = fopen(filename, MODE_READ)))
+    return;
+
+  getFileChunkBE(file, chunk_name, NULL);
+  if (strcmp(chunk_name, "RND1") == 0)
+  {
+    getFile32BitBE(file);              /* not used */
+
+    getFileChunkBE(file, chunk_name, NULL);
+    if (strcmp(chunk_name, "TAPE") != 0)
+    {
+      Error(ERR_WARN, "unknown format of tape file '%s'", filename);
+      fclose(file);
+      return;
+    }
+  }
+  else /* check for pre-2.0 file format with cookie string */
+  {
+    strcpy(cookie, chunk_name);
+    fgets(&cookie[4], MAX_LINE_LEN - 4, file);
+    if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
+      cookie[strlen(cookie) - 1] = '\0';
+
+    if (!checkCookieString(cookie, TAPE_COOKIE_TMPL))
+    {
+      Error(ERR_WARN, "unknown format of tape file '%s'", filename);
+      fclose(file);
+      return;
+    }
+
+    if ((tape.file_version = getFileVersionFromCookieString(cookie)) == -1)
+    {
+      Error(ERR_WARN, "unsupported version of tape file '%s'", filename);
+      fclose(file);
+      return;
+    }
+
+    /* pre-2.0 tape files have no game version, so use file version here */
+    tape.game_version = tape.file_version;
+  }
+
+  if (tape.file_version < FILE_VERSION_1_2)
+  {
+    /* tape files from versions before 1.2.0 without chunk structure */
+    LoadTape_HEAD(file, TAPE_HEADER_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", FILE_VERS_CHUNK_SIZE,  LoadTape_VERS },
+      { "HEAD", TAPE_HEADER_SIZE,      LoadTape_HEAD },
+      { "INFO", -1,                    LoadTape_INFO },
+      { "BODY", -1,                    LoadTape_BODY },
+      {  NULL,  0,                     NULL }
+    };
+
+    while (getFileChunkBE(file, chunk_name, &chunk_size))
+    {
+      int i = 0;
+
+      while (chunk_info[i].name != NULL &&
+            strcmp(chunk_name, chunk_info[i].name) != 0)
+       i++;
+
+      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);
+
+       /* 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);
+       }
+      }
+    }
+  }
 
-  if (i != tape.length)
-    Error(ERR_WARN, "level recording file '%s' corrupted", filename);
+  fclose(file);
 
   tape.length_seconds = GetTapeLength();
+
+#if 0
+  printf("tape version: %d\n", tape.game_version);
+#endif
 }
 
-void SaveTape(int level_nr)
+void LoadTape(int level_nr)
+{
+  char *filename = getTapeFilename(level_nr);
+
+  LoadTapeFromFilename(filename);
+}
+
+static void SaveTape_VERS(FILE *file, struct TapeInfo *tape)
+{
+  putFileVersion(file, tape->file_version);
+  putFileVersion(file, tape->game_version);
+}
+
+static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape)
+{
+  int i;
+  byte store_participating_players = 0;
+
+  /* set bits for participating players for compact storage */
+  for(i=0; i<MAX_PLAYERS; i++)
+    if (tape->player_participates[i])
+      store_participating_players |= (1 << i);
+
+  putFile32BitBE(file, tape->random_seed);
+  putFile32BitBE(file, tape->date);
+  putFile32BitBE(file, tape->length);
+
+  fputc(store_participating_players, file);
+
+  /* unused bytes not at the end here for 4-byte alignment of engine_version */
+  WriteUnusedBytesToFile(file, TAPE_HEADER_UNUSED);
+
+  putFileVersion(file, tape->engine_version);
+}
+
+static void SaveTape_INFO(FILE *file, struct TapeInfo *tape)
 {
+  int level_identifier_size = strlen(tape->level_identifier) + 1;
   int i;
+
+  putFile16BitBE(file, level_identifier_size);
+
+  for(i=0; i < level_identifier_size; i++)
+    fputc(tape->level_identifier[i], file);
+
+  putFile16BitBE(file, tape->level_nr);
+}
+
+static void SaveTape_BODY(FILE *file, struct TapeInfo *tape)
+{
+  int i, j;
+
+  for(i=0; i<tape->length; i++)
+  {
+    for(j=0; j<MAX_PLAYERS; j++)
+      if (tape->player_participates[j])
+       fputc(tape->pos[i].action[j], file);
+
+    fputc(tape->pos[i].delay, file);
+  }
+}
+
+void SaveTape(int level_nr)
+{
   char *filename = getTapeFilename(level_nr);
   FILE *file;
   boolean new_tape = TRUE;
-  byte store_participating_players;
-  int num_participating_players;
+  int num_participating_players = 0;
+  int info_chunk_size;
+  int body_chunk_size;
+  int i;
 
-  InitTapeDirectory(leveldir[leveldir_nr].filename);
+  InitTapeDirectory(leveldir_current->filename);
 
   /* if a tape still exists, ask to overwrite it */
   if (access(filename, F_OK) == 0)
@@ -735,55 +1302,41 @@ void SaveTape(int level_nr)
       return;
   }
 
-  /* count number of players and set corresponding bits for compact storage */
-  store_participating_players = 0;
-  num_participating_players = 0;
-  for(i=0; i<MAX_PLAYERS; i++)
-  {
-    if (tape.player_participates[i])
-    {
-      num_participating_players++;
-      store_participating_players |= (1 << i);
-    }
-  }
-
-  if (!(file = fopen(filename, "w")))
+  if (!(file = fopen(filename, MODE_WRITE)))
   {
     Error(ERR_WARN, "cannot save level recording file '%s'", filename);
     return;
   }
 
-  fputs(TAPE_COOKIE, file);            /* file identifier */
-  fputc('\n', file);
-
-  putFileChunk(file, "HEAD", TAPE_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN);
+  tape.file_version = FILE_VERSION_ACTUAL;
+  tape.game_version = GAME_VERSION_ACTUAL;
 
-  putFile32BitInteger(file, tape.random_seed, BYTE_ORDER_BIG_ENDIAN);
-  putFile32BitInteger(file, tape.date, BYTE_ORDER_BIG_ENDIAN);
-  putFile32BitInteger(file, tape.length, BYTE_ORDER_BIG_ENDIAN);
+  /* count number of participating players  */
+  for(i=0; i<MAX_PLAYERS; i++)
+    if (tape.player_participates[i])
+      num_participating_players++;
 
-  fputc(store_participating_players, file);
+  info_chunk_size = 2 + (strlen(tape.level_identifier) + 1) + 2;
+  body_chunk_size = (num_participating_players + 1) * tape.length;
 
-  for(i=0; i<TAPE_HEADER_UNUSED; i++)  /* set unused header bytes to zero */
-    fputc(0, file);
+  putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED);
+  putFileChunkBE(file, "TAPE", CHUNK_SIZE_NONE);
 
-  putFileChunk(file, "BODY", (num_participating_players + 1) * tape.length,
-              BYTE_ORDER_BIG_ENDIAN);
+  putFileChunkBE(file, "VERS", FILE_VERS_CHUNK_SIZE);
+  SaveTape_VERS(file, &tape);
 
-  for(i=0; i<tape.length; i++)
-  {
-    int j;
+  putFileChunkBE(file, "HEAD", TAPE_HEADER_SIZE);
+  SaveTape_HEAD(file, &tape);
 
-    for(j=0; j<MAX_PLAYERS; j++)
-      if (tape.player_participates[j])
-       fputc(tape.pos[i].action[j], file);
+  putFileChunkBE(file, "INFO", info_chunk_size);
+  SaveTape_INFO(file, &tape);
 
-    fputc(tape.pos[i].delay, file);
-  }
+  putFileChunkBE(file, "BODY", body_chunk_size);
+  SaveTape_BODY(file, &tape);
 
   fclose(file);
 
-  chmod(filename, TAPE_PERMS);
+  SetFilePermissions(filename, PERMS_PRIVATE);
 
   tape.changed = FALSE;
 
@@ -791,6 +1344,57 @@ void SaveTape(int level_nr)
     Request("tape saved !", REQ_CONFIRM);
 }
 
+void DumpTape(struct TapeInfo *tape)
+{
+  int i, j;
+
+  if (TAPE_IS_EMPTY(*tape))
+  {
+    Error(ERR_WARN, "no tape available for level %d", tape->level_nr);
+    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("Level series identifier: '%s'\n", tape->level_identifier);
+  printf_line("-", 79);
+
+  for(i=0; i<tape->length; i++)
+  {
+    if (i >= MAX_TAPELEN)
+      break;
+
+    printf("%03d: ", i);
+
+    for(j=0; j<MAX_PLAYERS; j++)
+    {
+      if (tape->player_participates[j])
+      {
+       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' : ' '));
+      }
+    }
+
+    printf("(%03d)\n", tape->pos[i].delay);
+  }
+
+  printf_line("-", 79);
+}
+
+
+/* ========================================================================= */
+/* score file functions                                                      */
+/* ========================================================================= */
+
 void LoadScore(int level_nr)
 {
   int i;
@@ -807,7 +1411,7 @@ void LoadScore(int level_nr)
     highscore[i].Score = 0;
   }
 
-  if (!(file = fopen(filename, "r")))
+  if (!(file = fopen(filename, MODE_READ)))
     return;
 
   /* check file identifier */
@@ -815,9 +1419,9 @@ void LoadScore(int level_nr)
   if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
     cookie[strlen(cookie) - 1] = '\0';
 
-  if (strcmp(cookie, SCORE_COOKIE) != 0)
+  if (!checkCookieString(cookie, SCORE_COOKIE))
   {
-    Error(ERR_WARN, "wrong file identifier of score file '%s'", filename);
+    Error(ERR_WARN, "unknown format of score file '%s'", filename);
     fclose(file);
     return;
   }
@@ -850,9 +1454,9 @@ void SaveScore(int level_nr)
   char *filename = getScoreFilename(level_nr);
   FILE *file;
 
-  InitScoreDirectory(leveldir[leveldir_nr].filename);
+  InitScoreDirectory(leveldir_current->filename);
 
-  if (!(file = fopen(filename, "w")))
+  if (!(file = fopen(filename, MODE_WRITE)))
   {
     Error(ERR_WARN, "cannot save score for level %d", level_nr);
     return;
@@ -863,395 +1467,200 @@ void SaveScore(int level_nr)
   for(i=0; i<MAX_SCORE_ENTRIES; i++)
     fprintf(file, "%d %s\n", highscore[i].Score, highscore[i].Name);
 
-  fclose(file);
-
-  chmod(filename, SCORE_PERMS);
-}
-
-#define TOKEN_STR_FILE_IDENTIFIER      "file_identifier"
-#define TOKEN_STR_LAST_LEVEL_SERIES    "last_level_series"
-#define TOKEN_STR_PLAYER_PREFIX                "player_"
-
-#define TOKEN_VALUE_POSITION           30
-
-/* 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_DOUBLE_BUFFERING   6
-#define SETUP_TOKEN_SCROLL_DELAY       7
-#define SETUP_TOKEN_SOFT_SCROLLING     8
-#define SETUP_TOKEN_FADING             9
-#define SETUP_TOKEN_AUTORECORD         10
-#define SETUP_TOKEN_QUICK_DOORS                11
-#define SETUP_TOKEN_TEAM_MODE          12
-
-/* player setup */
-#define SETUP_TOKEN_USE_JOYSTICK       13
-#define SETUP_TOKEN_JOY_DEVICE_NAME    14
-#define SETUP_TOKEN_JOY_XLEFT          15
-#define SETUP_TOKEN_JOY_XMIDDLE                16
-#define SETUP_TOKEN_JOY_XRIGHT         17
-#define SETUP_TOKEN_JOY_YUPPER         18
-#define SETUP_TOKEN_JOY_YMIDDLE                19
-#define SETUP_TOKEN_JOY_YLOWER         20
-#define SETUP_TOKEN_JOY_SNAP           21
-#define SETUP_TOKEN_JOY_BOMB           22
-#define SETUP_TOKEN_KEY_LEFT           23
-#define SETUP_TOKEN_KEY_RIGHT          24
-#define SETUP_TOKEN_KEY_UP             25
-#define SETUP_TOKEN_KEY_DOWN           26
-#define SETUP_TOKEN_KEY_SNAP           27
-#define SETUP_TOKEN_KEY_BOMB           28
-
-/* level directory info */
-#define LEVELINFO_TOKEN_NAME           29
-#define LEVELINFO_TOKEN_AUTHOR         30
-#define LEVELINFO_TOKEN_LEVELS         31
-#define LEVELINFO_TOKEN_FIRST_LEVEL    32
-#define LEVELINFO_TOKEN_SORT_PRIORITY  33
-#define LEVELINFO_TOKEN_READONLY       34
-
-#define FIRST_GLOBAL_SETUP_TOKEN       SETUP_TOKEN_PLAYER_NAME
-#define LAST_GLOBAL_SETUP_TOKEN                SETUP_TOKEN_TEAM_MODE
-
-#define FIRST_PLAYER_SETUP_TOKEN       SETUP_TOKEN_USE_JOYSTICK
-#define LAST_PLAYER_SETUP_TOKEN                SETUP_TOKEN_KEY_BOMB
-
-#define FIRST_LEVELINFO_TOKEN          LEVELINFO_TOKEN_NAME
-#define LAST_LEVELINFO_TOKEN           LEVELINFO_TOKEN_READONLY
-
-#define TYPE_BOOLEAN                   1
-#define TYPE_SWITCH                    2
-#define TYPE_KEYSYM                    3
-#define TYPE_INTEGER                   4
-#define TYPE_STRING                    5
-
-static struct SetupInfo si;
-static struct SetupInputInfo sii;
-static struct LevelDirInfo ldi;
-static struct
-{
-  int type;
-  void *value;
-  char *text;
-} token_info[] =
-{
-  /* global setup */
-  { TYPE_STRING,  &si.player_name,     "player_name"                   },
-  { TYPE_SWITCH,  &si.sound,           "sound"                         },
-  { TYPE_SWITCH,  &si.sound_loops,     "repeating_sound_loops"         },
-  { TYPE_SWITCH,  &si.sound_music,     "background_music"              },
-  { TYPE_SWITCH,  &si.sound_simple,    "simple_sound_effects"          },
-  { TYPE_SWITCH,  &si.toons,           "toons"                         },
-  { TYPE_SWITCH,  &si.double_buffering,        "double_buffering"              },
-  { TYPE_SWITCH,  &si.scroll_delay,    "scroll_delay"                  },
-  { TYPE_SWITCH,  &si.soft_scrolling,  "soft_scrolling"                },
-  { TYPE_SWITCH,  &si.fading,          "screen_fading"                 },
-  { TYPE_SWITCH,  &si.autorecord,      "automatic_tape_recording"      },
-  { TYPE_SWITCH,  &si.quick_doors,     "quick_doors"                   },
-  { TYPE_SWITCH,  &si.team_mode,       "team_mode"                     },
-
-  /* player setup */
-  { TYPE_BOOLEAN, &sii.use_joystick,   ".use_joystick"                 },
-  { TYPE_STRING,  &sii.joy.device_name,        ".joy.device_name"              },
-  { TYPE_INTEGER, &sii.joy.xleft,      ".joy.xleft"                    },
-  { TYPE_INTEGER, &sii.joy.xmiddle,    ".joy.xmiddle"                  },
-  { TYPE_INTEGER, &sii.joy.xright,     ".joy.xright"                   },
-  { TYPE_INTEGER, &sii.joy.yupper,     ".joy.yupper"                   },
-  { TYPE_INTEGER, &sii.joy.ymiddle,    ".joy.ymiddle"                  },
-  { TYPE_INTEGER, &sii.joy.ylower,     ".joy.ylower"                   },
-  { TYPE_INTEGER, &sii.joy.snap,       ".joy.snap_field"               },
-  { TYPE_INTEGER, &sii.joy.bomb,       ".joy.place_bomb"               },
-  { TYPE_KEYSYM,  &sii.key.left,       ".key.move_left"                },
-  { TYPE_KEYSYM,  &sii.key.right,      ".key.move_right"               },
-  { TYPE_KEYSYM,  &sii.key.up,         ".key.move_up"                  },
-  { TYPE_KEYSYM,  &sii.key.down,       ".key.move_down"                },
-  { TYPE_KEYSYM,  &sii.key.snap,       ".key.snap_field"               },
-  { TYPE_KEYSYM,  &sii.key.bomb,       ".key.place_bomb"               },
-
-  /* level directory info */
-  { TYPE_STRING,  &ldi.name,           "name"                          },
-  { TYPE_STRING,  &ldi.author,         "author"                        },
-  { TYPE_INTEGER, &ldi.levels,         "levels"                        },
-  { TYPE_INTEGER, &ldi.first_level,    "first_level"                   },
-  { TYPE_INTEGER, &ldi.sort_priority,  "sort_priority"                 },
-  { TYPE_BOOLEAN, &ldi.readonly,       "readonly"                      }
-};
-
-static char *string_tolower(char *s)
-{
-  static char s_lower[100];
-  int i;
-
-  if (strlen(s) >= 100)
-    return s;
-
-  strcpy(s_lower, s);
-
-  for (i=0; i<strlen(s_lower); i++)
-    s_lower[i] = tolower(s_lower[i]);
-
-  return s_lower;
-}
-
-static int get_string_integer_value(char *s)
-{
-  static char *number_text[][3] =
-  {
-    { "0", "zero", "null", },
-    { "1", "one", "first" },
-    { "2", "two", "second" },
-    { "3", "three", "third" },
-    { "4", "four", "fourth" },
-    { "5", "five", "fifth" },
-    { "6", "six", "sixth" },
-    { "7", "seven", "seventh" },
-    { "8", "eight", "eighth" },
-    { "9", "nine", "ninth" },
-    { "10", "ten", "tenth" },
-    { "11", "eleven", "eleventh" },
-    { "12", "twelve", "twelfth" },
-  };
-
-  int i, j;
-
-  for (i=0; i<13; i++)
-    for (j=0; j<3; j++)
-      if (strcmp(string_tolower(s), number_text[i][j]) == 0)
-       return i;
-
-  return atoi(s);
-}
-
-static boolean get_string_boolean_value(char *s)
-{
-  if (strcmp(string_tolower(s), "true") == 0 ||
-      strcmp(string_tolower(s), "yes") == 0 ||
-      strcmp(string_tolower(s), "on") == 0 ||
-      get_string_integer_value(s) == 1)
-    return TRUE;
-  else
-    return FALSE;
-}
-
-static char *getFormattedSetupEntry(char *token, char *value)
-{
-  int i;
-  static char entry[MAX_LINE_LEN];
-
-  sprintf(entry, "%s:", token);
-  for (i=strlen(entry); i<TOKEN_VALUE_POSITION; i++)
-    entry[i] = ' ';
-  entry[i] = '\0';
-
-  strcat(entry, value);
-
-  return entry;
-}
-
-static void freeSetupFileList(struct SetupFileList *setup_file_list)
-{
-  if (!setup_file_list)
-    return;
-
-  if (setup_file_list->token)
-    free(setup_file_list->token);
-  if (setup_file_list->value)
-    free(setup_file_list->value);
-  if (setup_file_list->next)
-    freeSetupFileList(setup_file_list->next);
-  free(setup_file_list);
-}
-
-static struct SetupFileList *newSetupFileList(char *token, char *value)
-{
-  struct SetupFileList *new = checked_malloc(sizeof(struct SetupFileList));
-
-  new->token = checked_malloc(strlen(token) + 1);
-  strcpy(new->token, token);
-
-  new->value = checked_malloc(strlen(value) + 1);
-  strcpy(new->value, value);
-
-  new->next = NULL;
-
-  return new;
-}
-
-static char *getTokenValue(struct SetupFileList *setup_file_list,
-                          char *token)
-{
-  if (!setup_file_list)
-    return NULL;
-
-  if (strcmp(setup_file_list->token, token) == 0)
-    return setup_file_list->value;
-  else
-    return getTokenValue(setup_file_list->next, token);
-}
-
-static void setTokenValue(struct SetupFileList *setup_file_list,
-                         char *token, char *value)
-{
-  if (!setup_file_list)
-    return;
-
-  if (strcmp(setup_file_list->token, token) == 0)
-  {
-    free(setup_file_list->value);
-    setup_file_list->value = checked_malloc(strlen(value) + 1);
-    strcpy(setup_file_list->value, value);
-  }
-  else if (setup_file_list->next == NULL)
-    setup_file_list->next = newSetupFileList(token, value);
-  else
-    setTokenValue(setup_file_list->next, token, value);
-}
-
-#ifdef DEBUG
-static void printSetupFileList(struct SetupFileList *setup_file_list)
-{
-  if (!setup_file_list)
-    return;
-
-  printf("token: '%s'\n", setup_file_list->token);
-  printf("value: '%s'\n", setup_file_list->value);
+  fclose(file);
 
-  printSetupFileList(setup_file_list->next);
+  SetFilePermissions(filename, PERMS_PUBLIC);
 }
-#endif
 
-static struct SetupFileList *loadSetupFileList(char *filename)
-{
-  int line_len;
-  char line[MAX_LINE_LEN];
-  char *token, *value, *line_ptr;
-  struct SetupFileList *setup_file_list = newSetupFileList("", "");
-  struct SetupFileList *first_valid_list_entry;
 
-  FILE *file;
+/* ========================================================================= */
+/* setup file functions                                                      */
+/* ========================================================================= */
 
-  if (!(file = fopen(filename, "r")))
-  {
-    Error(ERR_WARN, "cannot open configuration file '%s'", filename);
-    return NULL;
-  }
+#define TOKEN_STR_PLAYER_PREFIX                        "player_"
 
-  while(!feof(file))
-  {
-    /* read next line of input file */
-    if (!fgets(line, MAX_LINE_LEN, file))
-      break;
+/* 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_SOFT_SCROLLING             7
+#define SETUP_TOKEN_FADING                     8
+#define SETUP_TOKEN_AUTORECORD                 9
+#define SETUP_TOKEN_QUICK_DOORS                        10
+#define SETUP_TOKEN_TEAM_MODE                  11
+#define SETUP_TOKEN_HANDICAP                   12
+#define SETUP_TOKEN_TIME_LIMIT                 13
+#define SETUP_TOKEN_FULLSCREEN                 14
+#define SETUP_TOKEN_ASK_ON_ESCAPE              15
+#define SETUP_TOKEN_GRAPHICS_SET               16
+#define SETUP_TOKEN_SOUNDS_SET                 17
+#define SETUP_TOKEN_MUSIC_SET                  18
+#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS    19
+#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS      20
+#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC       21
+
+#define NUM_GLOBAL_SETUP_TOKENS                        22
+
+/* editor setup */
+#define SETUP_TOKEN_EDITOR_EL_BOULDERDASH      0
+#define SETUP_TOKEN_EDITOR_EL_EMERALD_MINE     1
+#define SETUP_TOKEN_EDITOR_EL_MORE             2
+#define SETUP_TOKEN_EDITOR_EL_SOKOBAN          3
+#define SETUP_TOKEN_EDITOR_EL_SUPAPLEX         4
+#define SETUP_TOKEN_EDITOR_EL_DIAMOND_CAVES    5
+#define SETUP_TOKEN_EDITOR_EL_DX_BOULDERDASH   6
+#define SETUP_TOKEN_EDITOR_EL_CHARS            7
+#define SETUP_TOKEN_EDITOR_EL_CUSTOM           8
+
+#define NUM_EDITOR_SETUP_TOKENS                        9
+
+/* shortcut setup */
+#define SETUP_TOKEN_SHORTCUT_SAVE_GAME         0
+#define SETUP_TOKEN_SHORTCUT_LOAD_GAME         1
+#define SETUP_TOKEN_SHORTCUT_TOGGLE_PAUSE      2
+
+#define NUM_SHORTCUT_SETUP_TOKENS              3
 
-    /* cut trailing comment or whitespace from input line */
-    for (line_ptr = line; *line_ptr; line_ptr++)
-    {
-      if (*line_ptr == '#' || *line_ptr == '\n' || *line_ptr == '\r')
-      {
-       *line_ptr = '\0';
-       break;
-      }
-    }
+/* 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_BOMB            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_BOMB            15
 
-    /* cut trailing whitespaces from input line */
-    for (line_ptr = &line[strlen(line)]; line_ptr > line; line_ptr--)
-      if ((*line_ptr == ' ' || *line_ptr == '\t') && line_ptr[1] == '\0')
-       *line_ptr = '\0';
+#define NUM_PLAYER_SETUP_TOKENS                        16
 
-    /* ignore empty lines */
-    if (*line == '\0')
-      continue;
+/* system setup */
+#define SETUP_TOKEN_SYSTEM_SDL_AUDIODRIVER     0
+#define SETUP_TOKEN_SYSTEM_AUDIO_FRAGMENT_SIZE 1
 
-    line_len = strlen(line);
+#define NUM_SYSTEM_SETUP_TOKENS                        2
 
-    /* cut leading whitespaces from token */
-    for (token = line; *token; token++)
-      if (*token != ' ' && *token != '\t')
-       break;
+/* options setup */
+#define SETUP_TOKEN_OPTIONS_VERBOSE            0
 
-    /* find end of token */
-    for (line_ptr = token; *line_ptr; line_ptr++)
-    {
-      if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':')
-      {
-       *line_ptr = '\0';
-       break;
-      }
-    }
+#define NUM_OPTIONS_SETUP_TOKENS               1
 
-    if (line_ptr < line + line_len)
-      value = line_ptr + 1;
-    else
-      value = "\0";
 
-    /* cut leading whitespaces from value */
-    for (; *value; value++)
-      if (*value != ' ' && *value != '\t')
-       break;
+static struct SetupInfo si;
+static struct SetupEditorInfo sei;
+static struct SetupShortcutInfo ssi;
+static struct SetupInputInfo sii;
+static struct SetupSystemInfo syi;
+static struct OptionInfo soi;
 
-    if (*token && *value)
-      setTokenValue(setup_file_list, token, value);
-  }
+static struct TokenInfo global_setup_tokens[] =
+{
+  { TYPE_STRING, &si.player_name,      "player_name"                   },
+  { TYPE_SWITCH, &si.sound,            "sound"                         },
+  { TYPE_SWITCH, &si.sound_loops,      "repeating_sound_loops"         },
+  { TYPE_SWITCH, &si.sound_music,      "background_music"              },
+  { TYPE_SWITCH, &si.sound_simple,     "simple_sound_effects"          },
+  { TYPE_SWITCH, &si.toons,            "toons"                         },
+  { TYPE_SWITCH, &si.scroll_delay,     "scroll_delay"                  },
+  { TYPE_SWITCH, &si.soft_scrolling,   "soft_scrolling"                },
+  { TYPE_SWITCH, &si.fading,           "screen_fading"                 },
+  { TYPE_SWITCH, &si.autorecord,       "automatic_tape_recording"      },
+  { TYPE_SWITCH, &si.quick_doors,      "quick_doors"                   },
+  { TYPE_SWITCH, &si.team_mode,                "team_mode"                     },
+  { TYPE_SWITCH, &si.handicap,         "handicap"                      },
+  { TYPE_SWITCH, &si.time_limit,       "time_limit"                    },
+  { TYPE_SWITCH, &si.fullscreen,       "fullscreen"                    },
+  { TYPE_SWITCH, &si.ask_on_escape,    "ask_on_escape"                 },
+  { TYPE_STRING, &si.graphics_set,     "graphics_set"                  },
+  { TYPE_STRING, &si.sounds_set,       "sounds_set"                    },
+  { TYPE_STRING, &si.music_set,                "music_set"                     },
+  { TYPE_SWITCH, &si.override_level_graphics, "override_level_graphics"        },
+  { TYPE_SWITCH, &si.override_level_sounds,   "override_level_sounds"  },
+  { TYPE_SWITCH, &si.override_level_music,    "override_level_music"   },
+};
 
-  fclose(file);
+static struct TokenInfo editor_setup_tokens[] =
+{
+  { TYPE_SWITCH, &sei.el_boulderdash,  "editor.el_boulderdash"         },
+  { TYPE_SWITCH, &sei.el_emerald_mine, "editor.el_emerald_mine"        },
+  { 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"     },
+  { TYPE_SWITCH, &sei.el_chars,                "editor.el_chars"               },
+  { TYPE_SWITCH, &sei.el_custom,       "editor.el_custom"              },
+};
 
-  first_valid_list_entry = setup_file_list->next;
+static struct TokenInfo shortcut_setup_tokens[] =
+{
+  { TYPE_KEY_X11, &ssi.save_game,      "shortcut.save_game"            },
+  { TYPE_KEY_X11, &ssi.load_game,      "shortcut.load_game"            },
+  { TYPE_KEY_X11, &ssi.toggle_pause,   "shortcut.toggle_pause"         }
+};
 
-  /* free empty list header */
-  setup_file_list->next = NULL;
-  freeSetupFileList(setup_file_list);
+static struct TokenInfo player_setup_tokens[] =
+{
+  { TYPE_BOOLEAN, &sii.use_joystick,   ".use_joystick"                 },
+  { TYPE_STRING,  &sii.joy.device_name,        ".joy.device_name"              },
+  { TYPE_INTEGER, &sii.joy.xleft,      ".joy.xleft"                    },
+  { TYPE_INTEGER, &sii.joy.xmiddle,    ".joy.xmiddle"                  },
+  { TYPE_INTEGER, &sii.joy.xright,     ".joy.xright"                   },
+  { TYPE_INTEGER, &sii.joy.yupper,     ".joy.yupper"                   },
+  { TYPE_INTEGER, &sii.joy.ymiddle,    ".joy.ymiddle"                  },
+  { TYPE_INTEGER, &sii.joy.ylower,     ".joy.ylower"                   },
+  { TYPE_INTEGER, &sii.joy.snap,       ".joy.snap_field"               },
+  { TYPE_INTEGER, &sii.joy.bomb,       ".joy.place_bomb"               },
+  { TYPE_KEY_X11, &sii.key.left,       ".key.move_left"                },
+  { TYPE_KEY_X11, &sii.key.right,      ".key.move_right"               },
+  { TYPE_KEY_X11, &sii.key.up,         ".key.move_up"                  },
+  { TYPE_KEY_X11, &sii.key.down,       ".key.move_down"                },
+  { TYPE_KEY_X11, &sii.key.snap,       ".key.snap_field"               },
+  { TYPE_KEY_X11, &sii.key.bomb,       ".key.place_bomb"               }
+};
 
-  if (first_valid_list_entry == NULL)
-    Error(ERR_WARN, "configuration file '%s' is empty", filename);
+static struct TokenInfo system_setup_tokens[] =
+{
+  { TYPE_STRING,  &syi.sdl_audiodriver,        "system.sdl_audiodriver"        },
+  { TYPE_INTEGER, &syi.audio_fragment_size,"system.audio_fragment_size"        }
+};
 
-  return first_valid_list_entry;
-}
+static struct TokenInfo options_setup_tokens[] =
+{
+  { TYPE_BOOLEAN, &soi.verbose,                "options.verbose"               }
+};
 
-static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
-                                        char *identifier)
+static char *get_corrected_login_name(char *login_name)
 {
-  if (!setup_file_list)
-    return;
+  /* needed because player name must be a fixed length string */
+  char *login_name_new = checked_malloc(MAX_PLAYER_NAME_LEN + 1);
 
-  if (strcmp(setup_file_list->token, TOKEN_STR_FILE_IDENTIFIER) == 0)
-  {
-    if (strcmp(setup_file_list->value, identifier) != 0)
-    {
-      Error(ERR_WARN, "configuration file has wrong version");
-      return;
-    }
-    else
-      return;
-  }
+  strncpy(login_name_new, login_name, MAX_PLAYER_NAME_LEN);
+  login_name_new[MAX_PLAYER_NAME_LEN] = '\0';
 
-  if (setup_file_list->next)
-    checkSetupFileListIdentifier(setup_file_list->next, identifier);
-  else
-  {
-    Error(ERR_WARN, "configuration file has no version information");
-    return;
-  }
-}
+  if (strlen(login_name) > MAX_PLAYER_NAME_LEN)                /* name has been cut */
+    if (strchr(login_name_new, ' '))
+      *strchr(login_name_new, ' ') = '\0';
 
-static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi)
-{
-  ldi->name = getStringCopy(ANONYMOUS_NAME);
-  ldi->author = getStringCopy(ANONYMOUS_NAME);
-  ldi->levels = 0;
-  ldi->first_level = 0;
-  ldi->sort_priority = LEVELCLASS_UNDEFINED;   /* default: least priority */
-  ldi->readonly = TRUE;
+  return login_name_new;
 }
 
 static void setSetupInfoToDefaults(struct SetupInfo *si)
 {
   int i;
 
-  si->player_name = getStringCopy(getLoginName());
+  si->player_name = get_corrected_login_name(getLoginName());
 
   si->sound = TRUE;
   si->sound_loops = TRUE;
@@ -1265,11 +1674,37 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->fading = FALSE;
   si->autorecord = TRUE;
   si->quick_doors = FALSE;
+  si->team_mode = FALSE;
+  si->handicap = TRUE;
+  si->time_limit = TRUE;
+  si->fullscreen = FALSE;
+  si->ask_on_escape = TRUE;
+
+  si->graphics_set = getStringCopy(GRAPHICS_SUBDIR);
+  si->sounds_set = getStringCopy(SOUNDS_SUBDIR);
+  si->music_set = getStringCopy(MUSIC_SUBDIR);
+  si->override_level_graphics = FALSE;
+  si->override_level_sounds = FALSE;
+  si->override_level_music = FALSE;
+
+  si->editor.el_boulderdash = TRUE;
+  si->editor.el_emerald_mine = TRUE;
+  si->editor.el_more = TRUE;
+  si->editor.el_sokoban = TRUE;
+  si->editor.el_supaplex = TRUE;
+  si->editor.el_diamond_caves = TRUE;
+  si->editor.el_dx_boulderdash = TRUE;
+  si->editor.el_chars = TRUE;
+  si->editor.el_custom = TRUE;
+
+  si->shortcut.save_game = DEFAULT_KEY_SAVE_GAME;
+  si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME;
+  si->shortcut.toggle_pause = DEFAULT_KEY_TOGGLE_PAUSE;
 
   for (i=0; i<MAX_PLAYERS; i++)
   {
     si->input[i].use_joystick = FALSE;
-    si->input[i].joy.device_name = getStringCopy(joystick_device_name[i]);
+    si->input[i].joy.device_name=getStringCopy(getDeviceNameFromJoystickNr(i));
     si->input[i].joy.xleft   = JOYSTICK_XLEFT;
     si->input[i].joy.xmiddle = JOYSTICK_XMIDDLE;
     si->input[i].joy.xright  = JOYSTICK_XRIGHT;
@@ -1278,64 +1713,49 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
     si->input[i].joy.ylower  = JOYSTICK_YLOWER;
     si->input[i].joy.snap  = (i == 0 ? JOY_BUTTON_1 : 0);
     si->input[i].joy.bomb  = (i == 0 ? JOY_BUTTON_2 : 0);
-    si->input[i].key.left  = (i == 0 ? DEFAULT_KEY_LEFT  : KEY_UNDEFINDED);
-    si->input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KEY_UNDEFINDED);
-    si->input[i].key.up    = (i == 0 ? DEFAULT_KEY_UP    : KEY_UNDEFINDED);
-    si->input[i].key.down  = (i == 0 ? DEFAULT_KEY_DOWN  : KEY_UNDEFINDED);
-    si->input[i].key.snap  = (i == 0 ? DEFAULT_KEY_SNAP  : KEY_UNDEFINDED);
-    si->input[i].key.bomb  = (i == 0 ? DEFAULT_KEY_BOMB  : KEY_UNDEFINDED);
+    si->input[i].key.left  = (i == 0 ? DEFAULT_KEY_LEFT  : KSYM_UNDEFINED);
+    si->input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KSYM_UNDEFINED);
+    si->input[i].key.up    = (i == 0 ? DEFAULT_KEY_UP    : KSYM_UNDEFINED);
+    si->input[i].key.down  = (i == 0 ? DEFAULT_KEY_DOWN  : KSYM_UNDEFINED);
+    si->input[i].key.snap  = (i == 0 ? DEFAULT_KEY_SNAP  : KSYM_UNDEFINED);
+    si->input[i].key.bomb  = (i == 0 ? DEFAULT_KEY_BOMB  : KSYM_UNDEFINED);
   }
-}
-
-static void setSetupInfo(int token_nr, char *token_value)
-{
-  int token_type = token_info[token_nr].type;
-  void *setup_value = token_info[token_nr].value;
-
-  if (token_value == NULL)
-    return;
-
-  /* set setup field to corresponding token value */
-  switch (token_type)
-  {
-    case TYPE_BOOLEAN:
-    case TYPE_SWITCH:
-      *(boolean *)setup_value = get_string_boolean_value(token_value);
-      break;
-
-    case TYPE_KEYSYM:
-      *(KeySym *)setup_value = getKeySymFromX11KeyName(token_value);
-      break;
 
-    case TYPE_INTEGER:
-      *(int *)setup_value = get_string_integer_value(token_value);
-      break;
-
-    case TYPE_STRING:
-      if (*(char **)setup_value != NULL)
-       free(*(char **)setup_value);
-      *(char **)setup_value = getStringCopy(token_value);
-      break;
+  si->system.sdl_audiodriver = getStringCopy(ARG_DEFAULT);
+  si->system.audio_fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
 
-    default:
-      break;
-  }
+  si->options.verbose = FALSE;
 }
 
-static void decodeSetupFileList(struct SetupFileList *setup_file_list)
+static void decodeSetupFileHash(SetupFileHash *setup_file_hash)
 {
   int i, pnr;
 
-  if (!setup_file_list)
+  if (!setup_file_hash)
     return;
 
-  /* handle global setup values */
+  /* global setup */
   si = setup;
-  for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++)
-    setSetupInfo(i, getTokenValue(setup_file_list, token_info[i].text));
+  for (i=0; i<NUM_GLOBAL_SETUP_TOKENS; i++)
+    setSetupInfo(global_setup_tokens, i,
+                getHashEntry(setup_file_hash, global_setup_tokens[i].text));
   setup = si;
 
-  /* handle player specific setup values */
+  /* 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));
+  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));
+  setup.shortcut = ssi;
+
+  /* player setup */
   for (pnr=0; pnr<MAX_PLAYERS; pnr++)
   {
     char prefix[30];
@@ -1343,348 +1763,105 @@ static void decodeSetupFileList(struct SetupFileList *setup_file_list)
     sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, pnr + 1);
 
     sii = setup.input[pnr];
-    for (i=FIRST_PLAYER_SETUP_TOKEN; i<=LAST_PLAYER_SETUP_TOKEN; i++)
+    for (i=0; i<NUM_PLAYER_SETUP_TOKENS; i++)
     {
       char full_token[100];
 
-      sprintf(full_token, "%s%s", prefix, token_info[i].text);
-      setSetupInfo(i, getTokenValue(setup_file_list, full_token));
+      sprintf(full_token, "%s%s", prefix, player_setup_tokens[i].text);
+      setSetupInfo(player_setup_tokens, i,
+                  getHashEntry(setup_file_hash, full_token));
     }
     setup.input[pnr] = sii;
   }
-}
-
-int getLevelSeriesNrFromLevelSeriesName(char *level_series_name)
-{
-  int i;
-
-  if (!level_series_name)
-    return 0;
-
-  for (i=0; i<num_leveldirs; i++)
-    if (strcmp(level_series_name, leveldir[i].filename) == 0)
-      return i;
-
-  return 0;
-}
-
-int getLastPlayedLevelOfLevelSeries(char *level_series_name)
-{
-  char *token_value;
-  int level_series_nr = getLevelSeriesNrFromLevelSeriesName(level_series_name);
-  int last_level_nr = leveldir[level_series_nr].first_level;
-
-  if (!level_series_name)
-    return 0;
-
-  token_value = getTokenValue(level_setup_list, level_series_name);
-
-  if (token_value)
-  {
-    last_level_nr = atoi(token_value);
-
-    if (last_level_nr < leveldir[level_series_nr].first_level)
-      last_level_nr = leveldir[level_series_nr].first_level;
-    if (last_level_nr > leveldir[level_series_nr].last_level)
-      last_level_nr = leveldir[level_series_nr].last_level;
-  }
-
-  return last_level_nr;
-}
-
-static int compareLevelDirInfoEntries(const void *object1, const void *object2)
-{
-  const struct LevelDirInfo *entry1 = object1;
-  const struct LevelDirInfo *entry2 = object2;
-  int compare_result;
-
-  if (entry1->sort_priority != entry2->sort_priority)
-    compare_result = entry1->sort_priority - entry2->sort_priority;
-  else
-  {
-    char *name1 = getStringToLower(entry1->name);
-    char *name2 = getStringToLower(entry2->name);
-
-    compare_result = strcmp(name1, name2);
-
-    free(name1);
-    free(name2);
-  }
-
-  return compare_result;
-}
-
-static int LoadLevelInfoFromLevelDir(char *level_directory, int start_entry)
-{
-  DIR *dir;
-  struct stat file_status;
-  char *directory = NULL;
-  char *filename = NULL;
-  struct SetupFileList *setup_file_list = NULL;
-  struct dirent *dir_entry;
-  int i, current_entry = start_entry;
-
-  if ((dir = opendir(level_directory)) == NULL)
-  {
-    Error(ERR_WARN, "cannot read level directory '%s'", level_directory);
-    return current_entry;
-  }
-
-  while (current_entry < MAX_LEVDIR_ENTRIES)
-  {
-    if ((dir_entry = readdir(dir)) == NULL)    /* last directory entry */
-      break;
-
-    /* skip entries for current and parent directory */
-    if (strcmp(dir_entry->d_name, ".")  == 0 ||
-       strcmp(dir_entry->d_name, "..") == 0)
-      continue;
-
-    /* find out if directory entry is itself a directory */
-    directory = getPath2(level_directory, dir_entry->d_name);
-    if (stat(directory, &file_status) != 0 ||          /* cannot stat file */
-       (file_status.st_mode & S_IFMT) != S_IFDIR)      /* not a directory */
-    {
-      free(directory);
-      continue;
-    }
-
-    filename = getPath2(directory, LEVELINFO_FILENAME);
-    setup_file_list = loadSetupFileList(filename);
-
-    if (setup_file_list)
-    {
-      checkSetupFileListIdentifier(setup_file_list, LEVELINFO_COOKIE);
-      setLevelDirInfoToDefaults(&leveldir[current_entry]);
-
-      ldi = leveldir[current_entry];
-      for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++)
-       setSetupInfo(i, getTokenValue(setup_file_list, token_info[i].text));
-      leveldir[current_entry] = ldi;
-
-      leveldir[current_entry].filename = getStringCopy(dir_entry->d_name);
-      leveldir[current_entry].last_level =
-       leveldir[current_entry].first_level +
-       leveldir[current_entry].levels - 1;
-      leveldir[current_entry].user_defined =
-       (level_directory == options.level_directory ? FALSE : TRUE);
-      leveldir[current_entry].color = LEVELCOLOR(current_entry);
-
-      freeSetupFileList(setup_file_list);
-      current_entry++;
-    }
-    else
-      Error(ERR_WARN, "ignoring level directory '%s'", directory);
-
-    free(directory);
-    free(filename);
-  }
-
-  if (current_entry == MAX_LEVDIR_ENTRIES)
-    Error(ERR_WARN, "using %d level directories -- ignoring the rest",
-         current_entry);
-
-  closedir(dir);
-
-  if (current_entry == start_entry)
-    Error(ERR_WARN, "cannot find any valid level series in directory '%s'",
-         level_directory);
-
-  return current_entry;
-}
-
-void LoadLevelInfo()
-{
-  InitUserLevelDirectory(getLoginName());
-
-  num_leveldirs = 0;
-  leveldir_nr = 0;
-
-  num_leveldirs = LoadLevelInfoFromLevelDir(options.level_directory,
-                                           num_leveldirs);
-  num_leveldirs = LoadLevelInfoFromLevelDir(getUserLevelDir(""),
-                                           num_leveldirs);
-
-  if (num_leveldirs == 0)
-    Error(ERR_EXIT, "cannot find any valid level series in any directory");
-
-  if (num_leveldirs > 1)
-    qsort(leveldir, num_leveldirs, sizeof(struct LevelDirInfo),
-         compareLevelDirInfoEntries);
-}
-
-static void SaveUserLevelInfo()
-{
-  char *filename;
-  FILE *file;
-  int i;
-
-  filename = getPath2(getUserLevelDir(getLoginName()), LEVELINFO_FILENAME);
-
-  if (!(file = fopen(filename, "w")))
-  {
-    Error(ERR_WARN, "cannot write level info file '%s'", filename);
-    free(filename);
-    return;
-  }
 
-  /* always start with reliable default values */
-  setLevelDirInfoToDefaults(&ldi);
-
-  ldi.name = getLoginName();
-  ldi.author = getRealName();
-  ldi.levels = 100;
-  ldi.first_level = 1;
-  ldi.sort_priority = LEVELCLASS_USER_START;
-  ldi.readonly = FALSE;
-
-  fprintf(file, "%s\n\n",
-         getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, LEVELINFO_COOKIE));
-
-  for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++)
-    fprintf(file, "%s\n", getSetupLine("", i));
-
-  fclose(file);
-  free(filename);
-
-  chmod(filename, SETUP_PERMS);
+  /* 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));
+  setup.system = syi;
+
+  /* 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));
+  setup.options = soi;
 }
 
 void LoadSetup()
 {
-  char *filename;
-  struct SetupFileList *setup_file_list = NULL;
+  char *filename = getSetupFilename();
+  SetupFileHash *setup_file_hash = NULL;
 
   /* always start with reliable default values */
   setSetupInfoToDefaults(&setup);
 
-  filename = getPath2(getSetupDir(), SETUP_FILENAME);
-
-  setup_file_list = loadSetupFileList(filename);
+  setup_file_hash = loadSetupFileHash(filename);
 
-  if (setup_file_list)
+  if (setup_file_hash)
   {
-    checkSetupFileListIdentifier(setup_file_list, SETUP_COOKIE);
-    decodeSetupFileList(setup_file_list);
+    char *player_name_new;
+
+    checkSetupFileHashIdentifier(setup_file_hash, getCookie("SETUP"));
+    decodeSetupFileHash(setup_file_hash);
 
     setup.direct_draw = !setup.double_buffering;
 
-    freeSetupFileList(setup_file_list);
+    freeSetupFileHash(setup_file_hash);
 
     /* needed to work around problems with fixed length strings */
-    if (strlen(setup.player_name) > MAX_PLAYER_NAME_LEN)
-      setup.player_name[MAX_PLAYER_NAME_LEN] = '\0';
-    else if (strlen(setup.player_name) < MAX_PLAYER_NAME_LEN)
-    {
-      char *new_name = checked_malloc(MAX_PLAYER_NAME_LEN + 1);
-
-      strcpy(new_name, setup.player_name);
-      free(setup.player_name);
-      setup.player_name = new_name;
-    }
+    player_name_new = get_corrected_login_name(setup.player_name);
+    free(setup.player_name);
+    setup.player_name = player_name_new;
   }
   else
     Error(ERR_WARN, "using default setup values");
-
-  free(filename);
-}
-
-static char *getSetupLine(char *prefix, int token_nr)
-{
-  int i;
-  static char entry[MAX_LINE_LEN];
-  int token_type = token_info[token_nr].type;
-  void *setup_value = token_info[token_nr].value;
-  char *token_text = token_info[token_nr].text;
-
-  /* start with the prefix, token and some spaces to format output line */
-  sprintf(entry, "%s%s:", prefix, token_text);
-  for (i=strlen(entry); i<TOKEN_VALUE_POSITION; i++)
-    strcat(entry, " ");
-
-  /* continue with the token's value (which can have different types) */
-  switch (token_type)
-  {
-    case TYPE_BOOLEAN:
-      strcat(entry, (*(boolean *)setup_value ? "true" : "false"));
-      break;
-
-    case TYPE_SWITCH:
-      strcat(entry, (*(boolean *)setup_value ? "on" : "off"));
-      break;
-
-    case TYPE_KEYSYM:
-      {
-       KeySym keysym = *(KeySym *)setup_value;
-       char *keyname = getKeyNameFromKeySym(keysym);
-
-       strcat(entry, getX11KeyNameFromKeySym(keysym));
-       for (i=strlen(entry); i<50; i++)
-         strcat(entry, " ");
-
-       /* add comment, if useful */
-       if (strcmp(keyname, "(undefined)") != 0 &&
-           strcmp(keyname, "(unknown)") != 0)
-       {
-         strcat(entry, "# ");
-         strcat(entry, keyname);
-       }
-      }
-      break;
-
-    case TYPE_INTEGER:
-      {
-       char buffer[MAX_LINE_LEN];
-
-       sprintf(buffer, "%d", *(int *)setup_value);
-       strcat(entry, buffer);
-      }
-      break;
-
-    case TYPE_STRING:
-      strcat(entry, *(char **)setup_value);
-      break;
-
-    default:
-      break;
-  }
-
-  return entry;
 }
 
 void SaveSetup()
 {
-  int i, pnr;
-  char *filename;
+  char *filename = getSetupFilename();
   FILE *file;
+  int i, pnr;
 
   InitUserDataDirectory();
 
-  filename = getPath2(getSetupDir(), SETUP_FILENAME);
-
-  if (!(file = fopen(filename, "w")))
+  if (!(file = fopen(filename, MODE_WRITE)))
   {
     Error(ERR_WARN, "cannot write setup file '%s'", filename);
-    free(filename);
     return;
   }
 
-  fprintf(file, "%s\n",
-         getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, SETUP_COOKIE));
+  fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
+                                              getCookie("SETUP")));
   fprintf(file, "\n");
 
-  /* handle global setup values */
+  /* global setup */
   si = setup;
-  for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++)
+  for (i=0; i<NUM_GLOBAL_SETUP_TOKENS; i++)
   {
-    fprintf(file, "%s\n", getSetupLine("", i));
-
     /* just to make things nicer :) */
-    if (i == SETUP_TOKEN_PLAYER_NAME)
+    if (i == SETUP_TOKEN_PLAYER_NAME + 1 ||
+       i == SETUP_TOKEN_GRAPHICS_SET)
       fprintf(file, "\n");
+
+    fprintf(file, "%s\n", getSetupLine(global_setup_tokens, "", i));
   }
 
-  /* handle player specific setup values */
+  /* editor setup */
+  sei = setup.editor;
+  fprintf(file, "\n");
+  for (i=0; i<NUM_EDITOR_SETUP_TOKENS; i++)
+    fprintf(file, "%s\n", getSetupLine(editor_setup_tokens, "", i));
+
+  /* shortcut setup */
+  ssi = setup.shortcut;
+  fprintf(file, "\n");
+  for (i=0; i<NUM_SHORTCUT_SETUP_TOKENS; i++)
+    fprintf(file, "%s\n", getSetupLine(shortcut_setup_tokens, "", i));
+
+  /* player setup */
   for (pnr=0; pnr<MAX_PLAYERS; pnr++)
   {
     char prefix[30];
@@ -1693,151 +1870,98 @@ void SaveSetup()
     fprintf(file, "\n");
 
     sii = setup.input[pnr];
-    for (i=FIRST_PLAYER_SETUP_TOKEN; i<=LAST_PLAYER_SETUP_TOKEN; i++)
-      fprintf(file, "%s\n", getSetupLine(prefix, i));
+    for (i=0; i<NUM_PLAYER_SETUP_TOKENS; i++)
+      fprintf(file, "%s\n", getSetupLine(player_setup_tokens, prefix, i));
   }
 
+  /* system setup */
+  syi = setup.system;
+  fprintf(file, "\n");
+  for (i=0; i<NUM_SYSTEM_SETUP_TOKENS; i++)
+    fprintf(file, "%s\n", getSetupLine(system_setup_tokens, "", i));
+
+  /* options setup */
+  soi = setup.options;
+  fprintf(file, "\n");
+  for (i=0; i<NUM_OPTIONS_SETUP_TOKENS; i++)
+    fprintf(file, "%s\n", getSetupLine(options_setup_tokens, "", i));
+
   fclose(file);
-  free(filename);
 
-  chmod(filename, SETUP_PERMS);
+  SetFilePermissions(filename, PERMS_PRIVATE);
 }
 
-void LoadLevelSetup()
+void LoadCustomElementDescriptions()
 {
-  char *filename;
-
-  /* always start with reliable default values */
-  leveldir_nr = 0;
-  level_nr = 0;
-
-  filename = getPath2(getSetupDir(), LEVELSETUP_FILENAME);
-
-  if (level_setup_list)
-    freeSetupFileList(level_setup_list);
-
-  level_setup_list = loadSetupFileList(filename);
-
-  if (level_setup_list)
-  {
-    char *last_level_series =
-      getTokenValue(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES);
-
-    leveldir_nr = getLevelSeriesNrFromLevelSeriesName(last_level_series);
-    level_nr = getLastPlayedLevelOfLevelSeries(last_level_series);
+  char *filename = getCustomArtworkConfigFilename(ARTWORK_TYPE_GRAPHICS);
+  SetupFileHash *setup_file_hash;
+  int i;
 
-    checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
-  }
-  else
+  for (i=0; i<NUM_FILE_ELEMENTS; i++)
   {
-    level_setup_list = newSetupFileList(TOKEN_STR_FILE_IDENTIFIER,
-                                       LEVELSETUP_COOKIE);
-    Error(ERR_WARN, "using default setup values");
+    if (element_info[i].custom_description != NULL)
+    {
+      free(element_info[i].custom_description);
+      element_info[i].custom_description = NULL;
+    }
   }
 
-  free(filename);
-}
-
-void SaveLevelSetup()
-{
-  char *filename;
-  struct SetupFileList *list_entry = level_setup_list;
-  FILE *file;
-
-  InitUserDataDirectory();
-
-  setTokenValue(level_setup_list,
-               TOKEN_STR_LAST_LEVEL_SERIES, leveldir[leveldir_nr].filename);
-
-  setTokenValue(level_setup_list,
-               leveldir[leveldir_nr].filename, int2str(level_nr, 0));
-
-  filename = getPath2(getSetupDir(), LEVELSETUP_FILENAME);
-
-  if (!(file = fopen(filename, "w")))
-  {
-    Error(ERR_WARN, "cannot write setup file '%s'", filename);
-    free(filename);
+  if ((setup_file_hash = loadSetupFileHash(filename)) == NULL)
     return;
-  }
 
-  fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
-                                                LEVELSETUP_COOKIE));
-  while (list_entry)
+  for (i=0; i<NUM_FILE_ELEMENTS; i++)
   {
-    if (strcmp(list_entry->token, TOKEN_STR_FILE_IDENTIFIER) != 0)
-      fprintf(file, "%s\n",
-             getFormattedSetupEntry(list_entry->token, list_entry->value));
+    char *token = getStringCat2(element_info[i].token_name, ".name");
+    char *value = getHashEntry(setup_file_hash, token);
 
-    /* just to make things nicer :) */
-    if (strcmp(list_entry->token, TOKEN_STR_LAST_LEVEL_SERIES) == 0)
-      fprintf(file, "\n");
+    if (value != NULL)
+      element_info[i].custom_description = getStringCopy(value);
 
-    list_entry = list_entry->next;
+    free(token);
   }
 
-  fclose(file);
-  free(filename);
-
-  chmod(filename, SETUP_PERMS);
+  freeSetupFileHash(setup_file_hash);
 }
 
-#ifdef MSDOS
-static boolean initErrorFile()
+void LoadSpecialMenuDesignSettings()
 {
-  char *filename;
-  FILE *error_file;
-
-  InitUserDataDirectory();
-
-  filename = getPath2(getUserDataDir(), ERROR_FILENAME);
-  error_file = fopen(filename, "w");
-  free(filename);
-
-  if (error_file == NULL)
-    return FALSE;
-
-  fclose(error_file);
+  char *filename = getCustomArtworkConfigFilename(ARTWORK_TYPE_GRAPHICS);
+  SetupFileHash *setup_file_hash;
+  int i, j;
 
-  return TRUE;
-}
+  /* always start with reliable default values from default config */
+  for (i=0; image_config_vars[i].token != NULL; i++)
+    for (j=0; image_config[j].token != NULL; j++)
+      if (strcmp(image_config_vars[i].token, image_config[j].token) == 0)
+       *image_config_vars[i].value =
+         get_integer_from_string(image_config[j].value);
 
-FILE *openErrorFile()
-{
-  static boolean first_access = TRUE;
-  char *filename;
-  FILE *error_file;
+  if ((setup_file_hash = loadSetupFileHash(filename)) == NULL)
+    return;
 
-  if (first_access)
+  /* special case: initialize with default values that may be overwritten */
+  for (i=0; i < NUM_SPECIAL_GFX_ARGS; i++)
   {
-    if (!initErrorFile())
-      return NULL;
-
-    first_access = FALSE;
+    char *value_x = getHashEntry(setup_file_hash, "menu.draw_xoffset");
+    char *value_y = getHashEntry(setup_file_hash, "menu.draw_yoffset");
+    char *list_size = getHashEntry(setup_file_hash, "menu.list_size");
+
+    if (value_x != NULL)
+      menu.draw_xoffset[i] = get_integer_from_string(value_x);
+    if (value_y != NULL)
+      menu.draw_yoffset[i] = get_integer_from_string(value_y);
+    if (list_size != NULL)
+      menu.list_size[i] = get_integer_from_string(list_size);
   }
 
-  filename = getPath2(getUserDataDir(), ERROR_FILENAME);
-  error_file = fopen(filename, "a");
-  free(filename);
-
-  return error_file;
-}
-
-void dumpErrorFile()
-{
-  char *filename;
-  FILE *error_file;
-
-  filename = getPath2(getUserDataDir(), ERROR_FILENAME);
-  error_file = fopen(filename, "r");
-  free(filename);
-
-  if (error_file != NULL)
+  /* read (and overwrite with) values that may be specified in config file */
+  for (i=0; image_config_vars[i].token != NULL; i++)
   {
-    while (!feof(error_file))
-      fputc(fgetc(error_file), stderr);
+    char *value = getHashEntry(setup_file_hash, image_config_vars[i].token);
 
-    fclose(error_file);
+    if (value != NULL)
+      *image_config_vars[i].value = get_integer_from_string(value);
   }
+
+  freeSetupFileHash(setup_file_hash);
 }
-#endif