rnd-19990928-1-src
[rocksndiamonds.git] / src / files.c
index c3cb4b8ddaf769b0566f1f8a38da72a6aa7b7cea..1e44ad714fae1c8c10dc28134d70ec2060707d40 100644 (file)
@@ -12,6 +12,9 @@
 ***********************************************************/
 
 #include <ctype.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "files.h"
 #include "tools.h"
 #include "tape.h"
 #include "joystick.h"
 
-boolean LoadLevelInfo()
+#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    15      /* 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      /* 1.0 file version (old) */
+#define FILE_VERSION_1_2       12      /* 1.2 file version (still in use) */
+#define FILE_VERSION_1_4       14      /* 1.4 file version (new) */
+
+/* file identifier strings */
+#define LEVEL_COOKIE           "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.4"
+#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 LEVEL_COOKIE_12                "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.2"
+#define TAPE_COOKIE_10         "ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.0"
+
+/* file names and filename extensions */
+#ifndef MSDOS
+#define USERDATA_DIRECTORY     ".rocksndiamonds"
+#define LEVELSETUP_DIRECTORY   "levelsetup"
+#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 LEVELSETUP_DIRECTORY   "lvlsetup"
+#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_BD_START            400
+#define LEVELCLASS_BD_END              499
+#define LEVELCLASS_EM_START            500
+#define LEVELCLASS_EM_END              599
+#define LEVELCLASS_SP_START            600
+#define LEVELCLASS_SP_END              699
+#define LEVELCLASS_DX_START            700
+#define LEVELCLASS_DX_END              799
+
+#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_BD                  LEVELCLASS_BD_START
+#define LEVELCLASS_EM                  LEVELCLASS_EM_START
+#define LEVELCLASS_SP                  LEVELCLASS_SP_START
+#define LEVELCLASS_DX                  LEVELCLASS_DX_START
+
+#define LEVELCLASS_UNDEFINED           999
+
+#define NUM_LEVELCLASS_DESC    8
+char *levelclass_desc[NUM_LEVELCLASS_DESC] =
 {
-  int i;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
-  FILE *file;
+  "Tutorial Levels",
+  "Classic Originals",
+  "Contributions",
+  "Private Levels",
+  "Boulderdash",
+  "Emerald Mine",
+  "Supaplex",
+  "DX Boulderdash"
+};
+
+#define IS_LEVELCLASS_TUTORIAL(p) \
+       ((p)->sort_priority >= LEVELCLASS_TUTORIAL_START && \
+        (p)->sort_priority <= LEVELCLASS_TUTORIAL_END)
+#define IS_LEVELCLASS_CLASSICS(p) \
+       ((p)->sort_priority >= LEVELCLASS_CLASSICS_START && \
+        (p)->sort_priority <= LEVELCLASS_CLASSICS_END)
+#define IS_LEVELCLASS_CONTRIBUTION(p) \
+       ((p)->sort_priority >= LEVELCLASS_CONTRIBUTION_START && \
+        (p)->sort_priority <= LEVELCLASS_CONTRIBUTION_END)
+#define IS_LEVELCLASS_USER(p) \
+       ((p)->sort_priority >= LEVELCLASS_USER_START && \
+        (p)->sort_priority <= LEVELCLASS_USER_END)
+#define IS_LEVELCLASS_BD(p) \
+       ((p)->sort_priority >= LEVELCLASS_BD_START && \
+        (p)->sort_priority <= LEVELCLASS_BD_END)
+#define IS_LEVELCLASS_EM(p) \
+       ((p)->sort_priority >= LEVELCLASS_EM_START && \
+        (p)->sort_priority <= LEVELCLASS_EM_END)
+#define IS_LEVELCLASS_SP(p) \
+       ((p)->sort_priority >= LEVELCLASS_SP_START && \
+        (p)->sort_priority <= LEVELCLASS_SP_END)
+#define IS_LEVELCLASS_DX(p) \
+       ((p)->sort_priority >= LEVELCLASS_DX_START && \
+        (p)->sort_priority <= LEVELCLASS_DX_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 : \
+                        IS_LEVELCLASS_BD(n) ? LEVELCLASS_BD : \
+                        IS_LEVELCLASS_EM(n) ? LEVELCLASS_EM : \
+                        IS_LEVELCLASS_SP(n) ? LEVELCLASS_SP : \
+                        IS_LEVELCLASS_DX(n) ? LEVELCLASS_DX : \
+                        LEVELCLASS_UNDEFINED)
+
+#define LEVELCOLOR(n)  (IS_LEVELCLASS_TUTORIAL(n) ?            FC_BLUE : \
+                        IS_LEVELCLASS_CLASSICS(n) ?            FC_RED : \
+                        IS_LEVELCLASS_BD(n) ?                  FC_GREEN : \
+                        IS_LEVELCLASS_EM(n) ?                  FC_YELLOW : \
+                        IS_LEVELCLASS_SP(n) ?                  FC_GREEN : \
+                        IS_LEVELCLASS_DX(n) ?                  FC_YELLOW : \
+                        IS_LEVELCLASS_CONTRIBUTION(n) ?        FC_GREEN : \
+                        IS_LEVELCLASS_USER(n) ?                FC_RED : \
+                        FC_BLUE)
+
+#define LEVELSORTING(n)        (IS_LEVELCLASS_TUTORIAL(n) ?            0 : \
+                        IS_LEVELCLASS_CLASSICS(n) ?            1 : \
+                        IS_LEVELCLASS_BD(n) ?                  2 : \
+                        IS_LEVELCLASS_EM(n) ?                  3 : \
+                        IS_LEVELCLASS_SP(n) ?                  4 : \
+                        IS_LEVELCLASS_DX(n) ?                  5 : \
+                        IS_LEVELCLASS_CONTRIBUTION(n) ?        6 : \
+                        IS_LEVELCLASS_USER(n) ?                7 : \
+                        9)
+
+char *getLevelClassDescription(struct LevelDirInfo *ldi)
+{
+  int position = ldi->sort_priority / 100;
 
-  sprintf(filename,"%s/%s",level_directory,LEVDIR_FILENAME);
+  if (position >= 0 && position < NUM_LEVELCLASS_DESC)
+    return levelclass_desc[position];
+  else
+    return "Unknown Level Class";
+}
 
-  if (!(file=fopen(filename,"r")))
-  {
-    Error(ERR_WARN, "cannot read level info '%s'", filename);
-    return(FALSE);
-  }
+static void SaveUserLevelInfo();               /* for 'InitUserLevelDir()' */
+static char *getSetupLine(char *, int);                /* for 'SaveUserLevelInfo()' */
+
+char *getUserDataDir()
+{
+  static char *userdata_dir = NULL;
 
-  fscanf(file,"%s\n",cookie);
-  if (strcmp(cookie,LEVELDIR_COOKIE))  /* ungültiges Format? */
+  if (!userdata_dir)
   {
-    Error(ERR_WARN, "wrong format of level info file");
-    fclose(file);
-    return(FALSE);
+    char *home_dir = getHomeDir();
+    char *data_dir = USERDATA_DIRECTORY;
+
+    userdata_dir = getPath2(home_dir, data_dir);
   }
 
-  num_leveldirs = 0;
-  leveldir_nr = 0;
-  for(i=0;i<MAX_LEVDIR_ENTRIES;i++)
+  return userdata_dir;
+}
+
+static char *getSetupDir()
+{
+  return getUserDataDir();
+}
+
+static char *getUserLevelDir(char *level_subdir)
+{
+  static char *userlevel_dir = NULL;
+  char *data_dir = getUserDataDir();
+  char *userlevel_subdir = LEVELS_DIRECTORY;
+
+  if (userlevel_dir)
+    free(userlevel_dir);
+
+  if (strlen(level_subdir) > 0)
+    userlevel_dir = getPath3(data_dir, userlevel_subdir, level_subdir);
+  else
+    userlevel_dir = getPath2(data_dir, userlevel_subdir);
+
+  return userlevel_dir;
+}
+
+static char *getTapeDir(char *level_subdir)
+{
+  static char *tape_dir = NULL;
+  char *data_dir = getUserDataDir();
+  char *tape_subdir = TAPES_DIRECTORY;
+
+  if (tape_dir)
+    free(tape_dir);
+
+  if (strlen(level_subdir) > 0)
+    tape_dir = getPath3(data_dir, tape_subdir, level_subdir);
+  else
+    tape_dir = getPath2(data_dir, tape_subdir);
+
+  return tape_dir;
+}
+
+static char *getScoreDir(char *level_subdir)
+{
+  static char *score_dir = NULL;
+  char *data_dir = options.rw_base_directory;
+  char *score_subdir = SCORES_DIRECTORY;
+
+  if (score_dir)
+    free(score_dir);
+
+  if (strlen(level_subdir) > 0)
+    score_dir = getPath3(data_dir, score_subdir, level_subdir);
+  else
+    score_dir = getPath2(data_dir, score_subdir);
+
+  return score_dir;
+}
+
+static char *getLevelSetupDir(char *level_subdir)
+{
+  static char *levelsetup_dir = NULL;
+  char *data_dir = getUserDataDir();
+  char *levelsetup_subdir = LEVELSETUP_DIRECTORY;
+
+  if (levelsetup_dir)
+    free(levelsetup_dir);
+
+  if (strlen(level_subdir) > 0)
+    levelsetup_dir = getPath3(data_dir, levelsetup_subdir, level_subdir);
+  else
+    levelsetup_dir = getPath2(data_dir, levelsetup_subdir);
+
+  return levelsetup_dir;
+}
+
+static char *getLevelFilename(int nr)
+{
+  static char *filename = NULL;
+  char basename[MAX_FILENAME_LEN];
+
+  if (filename != NULL)
+    free(filename);
+
+  sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION);
+  filename = getPath3((leveldir[leveldir_nr].user_defined ?
+                      getUserLevelDir("") :
+                      options.level_directory),
+                     leveldir[leveldir_nr].filename,
+                     basename);
+
+  return filename;
+}
+
+static char *getTapeFilename(int nr)
+{
+  static char *filename = NULL;
+  char basename[MAX_FILENAME_LEN];
+
+  if (filename != NULL)
+    free(filename);
+
+  sprintf(basename, "%03d.%s", nr, TAPEFILE_EXTENSION);
+  filename = getPath2(getTapeDir(leveldir[leveldir_nr].filename), basename);
+
+  return filename;
+}
+
+static char *getScoreFilename(int nr)
+{
+  static char *filename = NULL;
+  char basename[MAX_FILENAME_LEN];
+
+  if (filename != NULL)
+    free(filename);
+
+  sprintf(basename, "%03d.%s", nr, SCOREFILE_EXTENSION);
+  filename = getPath2(getScoreDir(leveldir[leveldir_nr].filename), basename);
+
+  return filename;
+}
+
+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);
+}
+
+static void InitUserDataDirectory()
+{
+  createDirectory(getUserDataDir(), "user data");
+}
+
+static void InitTapeDirectory(char *level_subdir)
+{
+  createDirectory(getUserDataDir(), "user data");
+  createDirectory(getTapeDir(""), "main tape");
+  createDirectory(getTapeDir(level_subdir), "level tape");
+}
+
+static void InitScoreDirectory(char *level_subdir)
+{
+  createDirectory(getScoreDir(""), "main score");
+  createDirectory(getScoreDir(level_subdir), "level score");
+}
+
+static void InitUserLevelDirectory(char *level_subdir)
+{
+  if (access(getUserLevelDir(level_subdir), F_OK) != 0)
   {
-    fscanf(file,"%s",leveldir[i].filename);
-    fscanf(file,"%s",leveldir[i].name);
-    fscanf(file,"%d",&leveldir[i].levels);
-    fscanf(file,"%d",&leveldir[i].readonly);
-    if (feof(file))
-      break;
+    createDirectory(getUserDataDir(), "user data");
+    createDirectory(getUserLevelDir(""), "main user level");
+    createDirectory(getUserLevelDir(level_subdir), "user level");
 
-    num_leveldirs++;
+    SaveUserLevelInfo();
   }
+}
+
+static void InitLevelSetupDirectory(char *level_subdir)
+{
+  createDirectory(getUserDataDir(), "user data");
+  createDirectory(getLevelSetupDir(""), "main level setup");
+  createDirectory(getLevelSetupDir(level_subdir), "level setup");
+}
 
-  if (!num_leveldirs)
+static void setLevelInfoToDefaults()
+{
+  int i, x, y;
+
+  lev_fieldx = level.fieldx = STD_LEV_FIELDX;
+  lev_fieldy = level.fieldy = STD_LEV_FIELDY;
+
+  for(x=0; x<MAX_LEV_FIELDX; x++)
+    for(y=0; y<MAX_LEV_FIELDY; y++)
+      Feld[x][y] = Ur[x][y] = EL_ERDREICH;
+
+  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_DIAMANT;
+  level.double_speed = FALSE;
+  level.gravity = FALSE;
+
+  for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
+    level.name[i] = '\0';
+  for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
+    level.author[i] = '\0';
+
+  strcpy(level.name, NAMELESS_LEVEL_NAME);
+  strcpy(level.author, ANONYMOUS_NAME);
+
+  for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
+    level.score[i] = 10;
+
+  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;
+
+  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;
+
+  BorderElement = EL_BETON;
+
+  /* try to determine better author name than 'anonymous' */
+  if (strcmp(leveldir[leveldir_nr].author, ANONYMOUS_NAME) != 0)
   {
-    Error(ERR_WARN, "empty level info '%s'", filename);
-    return(FALSE);
+    strncpy(level.author, leveldir[leveldir_nr].author, MAX_LEVEL_AUTHOR_LEN);
+    level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+  }
+  else
+  {
+    switch (LEVELCLASS(&leveldir[leveldir_nr]))
+    {
+      case LEVELCLASS_TUTORIAL:
+       strcpy(level.author, PROGRAM_AUTHOR_STRING);
+       break;
+
+      case LEVELCLASS_CONTRIBUTION:
+       strncpy(level.author, leveldir[leveldir_nr].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;
+
+      default:
+       /* keep default value */
+       break;
+    }
   }
-
-  return(TRUE);
 }
 
 void LoadLevel(int level_nr)
 {
-  int i,x,y;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
+  int i, x, y;
+  char *filename = getLevelFilename(level_nr);
+  char cookie[MAX_LINE_LEN];
+  char chunk[CHUNK_ID_LEN + 1];
+  boolean encoding_16bit = FALSE;      /* default: maximal 256 elements */
+  int file_version = FILE_VERSION_1_4; /* last version of level files */
+  int chunk_length;
   FILE *file;
 
-  sprintf(filename,"%s/%s/%d",
-         level_directory,leveldir[leveldir_nr].filename,level_nr);
+  /* always start with reliable default values */
+  setLevelInfoToDefaults();
 
-  if (!(file = fopen(filename,"r")))
+  if (!(file = fopen(filename, "r")))
+  {
     Error(ERR_WARN, "cannot read level '%s' - creating new level", filename);
-  else
+    return;
+  }
+
+  /* check file identifier */
+  fgets(cookie, MAX_LINE_LEN, file);
+  if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
+    cookie[strlen(cookie) - 1] = '\0';
+
+  if (strcmp(cookie, LEVEL_COOKIE_10) == 0)    /* old 1.0 level format */
+    file_version = FILE_VERSION_1_0;
+  else if (strcmp(cookie, LEVEL_COOKIE_12) == 0)/* 1.2 (8 bit) level format */
+    file_version = FILE_VERSION_1_2;
+  else if (strcmp(cookie, LEVEL_COOKIE) != 0)  /* unknown level format */
   {
-    fgets(cookie,LEVEL_COOKIE_LEN,file);
-    fgetc(file);
+    Error(ERR_WARN, "wrong file identifier of level file '%s'", filename);
+    fclose(file);
+    return;
+  }
 
-    if (strcmp(cookie,LEVEL_COOKIE))   /* ungültiges Format? */
+  /* 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 != LEVEL_HEADER_SIZE)
     {
-      Error(ERR_WARN, "wrong format of level file '%s'", filename);
+      Error(ERR_WARN, "wrong 'HEAD' chunk of level file '%s'", filename);
       fclose(file);
-      file = NULL;
+      return;
+    }
+  }
+
+  lev_fieldx = level.fieldx = fgetc(file);
+  lev_fieldy = level.fieldy = fgetc(file);
+
+  level.time        = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
+  level.gems_needed = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
+
+  for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
+    level.name[i] = fgetc(file);
+  level.name[MAX_LEVEL_NAME_LEN] = 0;
+
+  for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
+    level.score[i] = fgetc(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);
+       else
+         level.yam_content[i][x][y] = EL_LEERRAUM;
+      }
     }
   }
 
-  if (file)
+  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);
+
+  encoding_16bit       = (fgetc(file) == 1 ? TRUE : FALSE);
+
+  for(i=0; i<LEVEL_HEADER_UNUSED; i++) /* skip unused header bytes */
+    fgetc(file);
+
+  if (file_version >= FILE_VERSION_1_2)
   {
-    lev_fieldx = level.fieldx = fgetc(file);
-    lev_fieldy = level.fieldy = fgetc(file);
-
-    level.time         = (fgetc(file)<<8) | fgetc(file);
-    level.edelsteine   = (fgetc(file)<<8) | fgetc(file);
-    for(i=0;i<MAX_LEVNAMLEN;i++)
-      level.name[i]    = fgetc(file);
-    level.name[MAX_LEVNAMLEN-1] = 0;
-    for(i=0;i<MAX_LEVSCORE_ENTRIES;i++)
-      level.score[i]   = fgetc(file);
-    for(i=0;i<4;i++)
-      for(y=0;y<3;y++)
-       for(x=0;x<3;x++)
-         level.mampfer_inhalt[i][x][y] = fgetc(file);
-    level.tempo_amoebe = fgetc(file);
-    level.dauer_sieb   = fgetc(file);
-    level.dauer_ablenk = fgetc(file);
-    level.amoebe_inhalt = fgetc(file);
-
-    for(i=0;i<NUM_FREE_LVHD_BYTES;i++) /* Rest frei / Headergröße 80 Bytes */
+    getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
+
+    /* 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;
+
+      getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
+    }
+
+    /* 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);
 
-    for(y=0;y<MAX_LEV_FIELDY;y++) 
-      for(x=0;x<MAX_LEV_FIELDX;x++) 
-       Feld[x][y] = Ur[x][y] = EL_ERDREICH;
+      if (level.num_yam_contents < 1 ||
+         level.num_yam_contents > MAX_ELEMENT_CONTENTS)
+      {
+#if DEBUG
+       printf("WARNING: num_yam_contents == %d (corrected)\n",
+              level.num_yam_contents);
+#endif
+       level.num_yam_contents = STD_ELEMENT_CONTENTS;
+      }
 
-    for(y=0;y<lev_fieldy;y++) 
-      for(x=0;x<lev_fieldx;x++) 
-       Feld[x][y] = Ur[x][y] = fgetc(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] =
+             (encoding_16bit ?
+              getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) :
+              fgetc(file));
 
-    fclose(file);
+      getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
+    }
 
-    if (level.time<=10)        /* Mindestspieldauer */
-      level.time = 10;
+    /* next check body chunk identifier and chunk length */
+    if (strcmp(chunk, "BODY") || chunk_length != lev_fieldx * lev_fieldy)
+    {
+      Error(ERR_WARN, "wrong 'BODY' chunk of level file '%s'", filename);
+      fclose(file);
+      return;
+    }
   }
-  else
+
+  /* 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;
+
+  /* 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] =
+       (encoding_16bit ?
+        getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) :
+        fgetc(file));
+
+  fclose(file);
+
+  /* player was faster than monsters in pre-1.0 levels */
+  if (file_version == FILE_VERSION_1_0 &&
+      IS_LEVELCLASS_CONTRIBUTION(&leveldir[leveldir_nr]))
   {
-    lev_fieldx = level.fieldx = STD_LEV_FIELDX;
-    lev_fieldy = level.fieldy = STD_LEV_FIELDY;
-
-    level.time         = 100;
-    level.edelsteine   = 0;
-    strncpy(level.name,"Nameless Level",MAX_LEVNAMLEN-1);
-    for(i=0;i<MAX_LEVSCORE_ENTRIES;i++)
-      level.score[i]   = 10;
-    for(i=0;i<4;i++)
-      for(y=0;y<3;y++)
-       for(x=0;x<3;x++)
-         level.mampfer_inhalt[i][x][y] = EL_FELSBROCKEN;
-    level.tempo_amoebe = 10;
-    level.dauer_sieb   = 10;
-    level.dauer_ablenk = 10;
-    level.amoebe_inhalt = EL_DIAMANT;
-
-    for(y=0;y<STD_LEV_FIELDY;y++) 
-      for(x=0;x<STD_LEV_FIELDX;x++) 
-       Feld[x][y] = Ur[x][y] = EL_ERDREICH;
-    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;
+    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;
   }
+
+  /* determine border element for this level */
+  SetBorderElement();
 }
 
 void SaveLevel(int level_nr)
 {
-  int i,x,y;
-  char filename[MAX_FILENAME_LEN];
+  int i, x, y;
+  char *filename = getLevelFilename(level_nr);
+  boolean encoding_16bit = FALSE;      /* default: maximal 256 elements */
+  char *oldest_possible_cookie;
   FILE *file;
 
-  sprintf(filename,"%s/%s/%d",
-         level_directory,leveldir[leveldir_nr].filename,level_nr);
-
-  if (!(file=fopen(filename,"w")))
+  if (!(file = fopen(filename, "w")))
   {
     Error(ERR_WARN, "cannot save level file '%s'", filename);
     return;
   }
 
-  fputs(LEVEL_COOKIE,file);            /* Formatkennung */
-  fputc(0x0a,file);
-
-  fputc(level.fieldx,file);
-  fputc(level.fieldy,file);
-  fputc(level.time / 256,file);
-  fputc(level.time % 256,file);
-  fputc(level.edelsteine / 256,file);
-  fputc(level.edelsteine % 256,file);
-
-  for(i=0;i<MAX_LEVNAMLEN;i++)
-    fputc(level.name[i],file);
-  for(i=0;i<MAX_LEVSCORE_ENTRIES;i++)
-    fputc(level.score[i],file);
-  for(i=0;i<4;i++)
-    for(y=0;y<3;y++)
-      for(x=0;x<3;x++)
-       fputc(level.mampfer_inhalt[i][x][y],file);
-  fputc(level.tempo_amoebe,file);
-  fputc(level.dauer_sieb,file);
-  fputc(level.dauer_ablenk,file);
-  fputc(level.amoebe_inhalt,file);
-
-  for(i=0;i<NUM_FREE_LVHD_BYTES;i++)   /* Rest frei / Headergröße 80 Bytes */
-    fputc(0,file);
-
-  for(y=0;y<lev_fieldy;y++) 
-    for(x=0;x<lev_fieldx;x++) 
-      fputc(Ur[x][y],file);
+  /* check yam content for 16-bit elements */
+  for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+       if (level.yam_content[i][x][y] > 255)
+         encoding_16bit = TRUE;
+
+  /* check level field for 16-bit elements */
+  for(y=0; y<lev_fieldy; y++) 
+    for(x=0; x<lev_fieldx; x++) 
+      if (Ur[x][y] > 255)
+       encoding_16bit = TRUE;
+
+  oldest_possible_cookie = (encoding_16bit ? LEVEL_COOKIE : LEVEL_COOKIE_12);
+
+  fputs(oldest_possible_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);
+
+  putFile16BitInteger(file, level.time, BYTE_ORDER_BIG_ENDIAN);
+  putFile16BitInteger(file, level.gems_needed, BYTE_ORDER_BIG_ENDIAN);
+
+  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++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+       fputc(encoding_16bit ? EL_LEERRAUM : 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);
+
+  fputc((encoding_16bit ? 1 : 0), file);
+
+  for(i=0; i<LEVEL_HEADER_UNUSED; i++) /* set unused header bytes to zero */
+    fputc(0, file);
+
+  putFileChunk(file, "AUTH", MAX_LEVEL_AUTHOR_LEN, BYTE_ORDER_BIG_ENDIAN);
+
+  for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
+    fputc(level.author[i], file);
+
+  putFileChunk(file, "CONT", 4 + MAX_ELEMENT_CONTENTS * 3 * 3,
+              BYTE_ORDER_BIG_ENDIAN);
+
+  fputc(EL_MAMPFER, file);
+  fputc(level.num_yam_contents, file);
+  fputc(0, file);
+  fputc(0, file);
+
+  for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+       if (encoding_16bit)
+         putFile16BitInteger(file, level.yam_content[i][x][y],
+                             BYTE_ORDER_BIG_ENDIAN);
+       else
+         fputc(level.yam_content[i][x][y], file);
+
+  putFileChunk(file, "BODY", lev_fieldx * lev_fieldy, BYTE_ORDER_BIG_ENDIAN);
+
+  for(y=0; y<lev_fieldy; y++) 
+    for(x=0; x<lev_fieldx; x++) 
+      if (encoding_16bit)
+       putFile16BitInteger(file, Ur[x][y], BYTE_ORDER_BIG_ENDIAN);
+      else
+       fputc(Ur[x][y], file);
 
   fclose(file);
 
   chmod(filename, LEVEL_PERMS);
 }
 
-void LoadLevelTape(int level_nr)
+void LoadTape(int level_nr)
 {
-  int i;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
+  int i, j;
+  char *filename = getTapeFilename(level_nr);
+  char cookie[MAX_LINE_LEN];
+  char chunk[CHUNK_ID_LEN + 1];
   FILE *file;
-  boolean levelrec_10 = FALSE;
+  int num_participating_players;
+  int file_version = FILE_VERSION_1_2; /* last version of tape files */
+  int chunk_length;
 
-#ifndef MSDOS
-  sprintf(filename,"%s/%s/%d.tape",
-         level_directory,leveldir[leveldir_nr].filename,level_nr);
-#else
-  sprintf(filename,"%s/%s/%d.tap",
-         level_directory,leveldir[leveldir_nr].filename,level_nr);
-#endif
+  /* always start with reliable default values (empty tape) */
+  TapeErase();
+
+  /* default values (also for pre-1.2 tapes) with only the first player */
+  tape.player_participates[0] = TRUE;
+  for(i=1; i<MAX_PLAYERS; i++)
+    tape.player_participates[i] = FALSE;
+
+  /* at least one (default: the first) player participates in every tape */
+  num_participating_players = 1;
+
+  if (!(file = fopen(filename, "r")))
+    return;
 
-  if ((file=fopen(filename,"r")))
+  /* check file identifier */
+  fgets(cookie, MAX_LINE_LEN, file);
+  if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
+    cookie[strlen(cookie) - 1] = '\0';
+
+  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 */
   {
-    fgets(cookie,LEVELREC_COOKIE_LEN,file);
-    fgetc(file);
-    if (!strcmp(cookie,LEVELREC_COOKIE_10))    /* old 1.0 tape format */
-      levelrec_10 = TRUE;
-    else if (strcmp(cookie,LEVELREC_COOKIE))   /* unknown tape format */
+    Error(ERR_WARN, "wrong file identifier of tape file '%s'", filename);
+    fclose(file);
+    return;
+  }
+
+  /* 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 format of level recording file '%s'", filename);
+      Error(ERR_WARN, "wrong 'HEAD' chunk of tape file '%s'", filename);
       fclose(file);
-      file = NULL;
+      return;
     }
   }
 
-  if (!file)
-    return;
+  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);
+
+  /* read header fields that are new since version 1.2 */
+  if (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);
+
+    /* since version 1.2, tapes store which players participate in the tape */
+    num_participating_players = 0;
+    for(i=0; i<MAX_PLAYERS; i++)
+    {
+      tape.player_participates[i] = FALSE;
 
-  tape.random_seed =
-    (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
-  tape.date =
-    (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
-  tape.length =
-    (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
+      if (store_participating_players & (1 << i))
+      {
+       tape.player_participates[i] = TRUE;
+       num_participating_players++;
+      }
+    }
+  }
 
   tape.level_nr = level_nr;
   tape.counter = 0;
@@ -253,25 +791,62 @@ void LoadLevelTape(int level_nr)
   tape.playing = FALSE;
   tape.pausing = FALSE;
 
-  for(i=0;i<tape.length;i++)
+  /* read chunk "BODY" */
+  if (file_version >= FILE_VERSION_1_2)
   {
-    int j;
+    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;
+    }
+  }
 
+  for(i=0; i<tape.length; i++)
+  {
     if (i >= MAX_TAPELEN)
       break;
 
     for(j=0; j<MAX_PLAYERS; j++)
     {
-      if (levelrec_10 && j>0)
-      {
-       tape.pos[i].action[j] = MV_NO_MOVING;
-       continue;
-      }
-      tape.pos[i].action[j] = fgetc(file);
+      tape.pos[i].action[j] = MV_NO_MOVING;
+
+      if (tape.player_participates[j])
+       tape.pos[i].action[j] = fgetc(file);
     }
 
     tape.pos[i].delay = fgetc(file);
 
+    if (file_version == FILE_VERSION_1_0)
+    {
+      /* eliminate possible diagonal moves in old tapes */
+      /* this is only for backward compatibility */
+
+      byte joy_dir[4] = { JOY_LEFT, JOY_RIGHT, JOY_UP, JOY_DOWN };
+      byte action = tape.pos[i].action[0];
+      int k, num_moves = 0;
+
+      for (k=0; k<4; k++)
+      {
+       if (action & joy_dir[k])
+       {
+         tape.pos[i + num_moves].action[0] = joy_dir[k];
+         if (num_moves > 0)
+           tape.pos[i + num_moves].delay = 0;
+         num_moves++;
+       }
+      }
+
+      if (num_moves > 1)
+      {
+       num_moves--;
+       i += num_moves;
+       tape.length += num_moves;
+      }
+    }
+
     if (feof(file))
       break;
   }
@@ -284,333 +859,290 @@ void LoadLevelTape(int level_nr)
   tape.length_seconds = GetTapeLength();
 }
 
-void SaveLevelTape(int level_nr)
+void SaveTape(int level_nr)
 {
   int i;
-  char filename[MAX_FILENAME_LEN];
+  char *filename = getTapeFilename(level_nr);
   FILE *file;
   boolean new_tape = TRUE;
+  byte store_participating_players;
+  int num_participating_players;
 
-#ifndef MSDOS
-  sprintf(filename,"%s/%s/%d.tape",
-         level_directory,leveldir[leveldir_nr].filename,level_nr);
-#else
-  sprintf(filename,"%s/%s/%d.tap",
-         level_directory,leveldir[leveldir_nr].filename,level_nr);
-#endif
+  InitTapeDirectory(leveldir[leveldir_nr].filename);
 
-  /* Testen, ob bereits eine Aufnahme existiert */
-  if ((file=fopen(filename,"r")))
+  /* if a tape still exists, ask to overwrite it */
+  if (access(filename, F_OK) == 0)
   {
     new_tape = FALSE;
-    fclose(file);
-
-    if (!Request("Replace old tape ?",REQ_ASK))
+    if (!Request("Replace old tape ?", REQ_ASK))
       return;
   }
 
-  if (!(file=fopen(filename,"w")))
+  /* 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")))
   {
     Error(ERR_WARN, "cannot save level recording file '%s'", filename);
     return;
   }
 
-  fputs(LEVELREC_COOKIE,file);         /* Formatkennung */
-  fputc(0x0a,file);
+  fputs(TAPE_COOKIE, file);            /* file identifier */
+  fputc('\n', file);
 
-  fputc((tape.random_seed >> 24) & 0xff,file);
-  fputc((tape.random_seed >> 16) & 0xff,file);
-  fputc((tape.random_seed >>  8) & 0xff,file);
-  fputc((tape.random_seed >>  0) & 0xff,file);
+  putFileChunk(file, "HEAD", TAPE_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN);
 
-  fputc((tape.date >>  24) & 0xff,file);
-  fputc((tape.date >>  16) & 0xff,file);
-  fputc((tape.date >>   8) & 0xff,file);
-  fputc((tape.date >>   0) & 0xff,file);
+  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);
 
-  fputc((tape.length >>  24) & 0xff,file);
-  fputc((tape.length >>  16) & 0xff,file);
-  fputc((tape.length >>   8) & 0xff,file);
-  fputc((tape.length >>   0) & 0xff,file);
+  fputc(store_participating_players, file);
 
-  for(i=0;i<tape.length;i++)
+  for(i=0; i<TAPE_HEADER_UNUSED; i++)  /* set unused header bytes to zero */
+    fputc(0, file);
+
+  putFileChunk(file, "BODY", (num_participating_players + 1) * tape.length,
+              BYTE_ORDER_BIG_ENDIAN);
+
+  for(i=0; i<tape.length; i++)
   {
     int j;
 
     for(j=0; j<MAX_PLAYERS; j++)
-      fputc(tape.pos[i].action[j],file);
+      if (tape.player_participates[j])
+       fputc(tape.pos[i].action[j], file);
 
-    fputc(tape.pos[i].delay,file);
+    fputc(tape.pos[i].delay, file);
   }
 
   fclose(file);
 
-  chmod(filename, LEVREC_PERMS);
+  chmod(filename, TAPE_PERMS);
 
   tape.changed = FALSE;
 
   if (new_tape)
-    Request("tape saved !",REQ_CONFIRM);
+    Request("tape saved !", REQ_CONFIRM);
 }
 
-boolean CreateNewScoreFile()
+void LoadScore(int level_nr)
 {
-  int i,j,k;
-  char filename[MAX_FILENAME_LEN];
-  char empty_alias[MAX_NAMELEN];
+  int i;
+  char *filename = getScoreFilename(level_nr);
+  char cookie[MAX_LINE_LEN];
+  char line[MAX_LINE_LEN];
+  char *line_ptr;
   FILE *file;
 
-  sprintf(filename,"%s/%s/%s",
-         level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
-
-  if (!(file=fopen(filename,"w")))
-    return(FALSE);
-
-  for(i=0;i<MAX_NAMELEN;i++)
-    empty_alias[i] = 0;
-  strncpy(empty_alias,EMPTY_ALIAS,MAX_NAMELEN-1);
-
-  fputs(SCORE_COOKIE,file);            /* Formatkennung */
-  for(i=0;i<leveldir[leveldir_nr].levels;i++)
+  /* always start with reliable default values */
+  for(i=0; i<MAX_SCORE_ENTRIES; i++)
   {
-    for(j=0;j<MAX_SCORE_ENTRIES;j++)
-    {
-      for(k=0;k<MAX_NAMELEN;k++)
-       fputc(empty_alias[k],file);
-      fputc(0,file);
-      fputc(0,file);
-    }
+    strcpy(highscore[i].Name, EMPTY_PLAYER_NAME);
+    highscore[i].Score = 0;
   }
-  fclose(file);
-
-  chmod(filename, SCORE_PERMS);
-  return(TRUE);
-}
 
-void LoadScore(int level_nr)
-{
-  int i,j;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
-  FILE *file;
+  if (!(file = fopen(filename, "r")))
+    return;
 
-  sprintf(filename,"%s/%s/%s",
-         level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+  /* check file identifier */
+  fgets(cookie, MAX_LINE_LEN, file);
+  if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
+    cookie[strlen(cookie) - 1] = '\0';
 
-  if (!(file = fopen(filename,"r")))
+  if (strcmp(cookie, SCORE_COOKIE) != 0)
   {
-    if (!CreateNewScoreFile())
-      Error(ERR_WARN, "cannot create score file '%s'", filename);
-    else if (!(file = fopen(filename,"r"))) 
-      Error(ERR_WARN, "cannot read score for level %d", level_nr);
+    Error(ERR_WARN, "wrong file identifier of score file '%s'", filename);
+    fclose(file);
+    return;
   }
 
-  if (file)
+  for(i=0; i<MAX_SCORE_ENTRIES; i++)
   {
-    fgets(cookie,SCORE_COOKIE_LEN,file);
-    if (strcmp(cookie,SCORE_COOKIE))   /* ungültiges Format? */
-    {
-      Error(ERR_WARN, "wrong format of score file '%s'", filename);
-      fclose(file);
-      file = NULL;
-    }
-  }
+    fscanf(file, "%d", &highscore[i].Score);
+    fgets(line, MAX_LINE_LEN, file);
 
-  if (file)
-  {
-    fseek(file,
-         SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)),
-         SEEK_SET);
-    for(i=0;i<MAX_SCORE_ENTRIES;i++)
-    {
-      for(j=0;j<MAX_NAMELEN;j++)
-       highscore[i].Name[j] = fgetc(file);
-      highscore[i].Score = (fgetc(file)<<8) | fgetc(file);
-    }
-    fclose(file);
-  }
-  else
-  {
-    for(i=0;i<MAX_SCORE_ENTRIES;i++)
+    if (line[strlen(line) - 1] == '\n')
+      line[strlen(line) - 1] = '\0';
+
+    for (line_ptr = line; *line_ptr; line_ptr++)
     {
-      strcpy(highscore[i].Name,EMPTY_ALIAS);
-      highscore[i].Score = 0;
+      if (*line_ptr != ' ' && *line_ptr != '\t' && *line_ptr != '\0')
+      {
+       strncpy(highscore[i].Name, line_ptr, MAX_PLAYER_NAME_LEN);
+       highscore[i].Name[MAX_PLAYER_NAME_LEN] = '\0';
+       break;
+      }
     }
   }
+
+  fclose(file);
 }
 
 void SaveScore(int level_nr)
 {
-  int i,j;
-  char filename[MAX_FILENAME_LEN];
+  int i;
+  char *filename = getScoreFilename(level_nr);
   FILE *file;
 
-  sprintf(filename,"%s/%s/%s",
-         level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+  InitScoreDirectory(leveldir[leveldir_nr].filename);
 
-  if (!(file=fopen(filename,"r+")))
+  if (!(file = fopen(filename, "w")))
   {
     Error(ERR_WARN, "cannot save score for level %d", level_nr);
     return;
   }
 
-  fseek(file,
-       SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)),
-       SEEK_SET);
-  for(i=0;i<MAX_SCORE_ENTRIES;i++)
-  {
-    for(j=0;j<MAX_NAMELEN;j++)
-      fputc(highscore[i].Name[j],file);
-    fputc(highscore[i].Score / 256,file);
-    fputc(highscore[i].Score % 256,file);
-  }
-  fclose(file);
-}
-
-void LoadJoystickData()
-{
-  int i;
-  char cookie[256];
-  FILE *file;
-
-  if (joystick_status==JOYSTICK_OFF)
-    return;
+  fprintf(file, "%s\n\n", SCORE_COOKIE);
 
-#ifndef MSDOS
-  if (!(file=fopen(JOYDAT_FILE,"r")))
-    return;
-
-  fscanf(file,"%s",cookie);
-  if (strcmp(cookie,JOYSTICK_COOKIE))  /* ungültiges Format? */
-  {
-    Error(ERR_WARN, "wrong format of joystick file '%s'", JOYDAT_FILE);
-    fclose(file);
-    return;
-  }
+  for(i=0; i<MAX_SCORE_ENTRIES; i++)
+    fprintf(file, "%d %s\n", highscore[i].Score, highscore[i].Name);
 
-  for(i=0;i<2;i++)
-  {
-    fscanf(file,"%s",cookie);
-    fscanf(file, "%d %d %d \n",
-          &joystick[i].xleft, &joystick[i].xmiddle, &joystick[i].xright);
-    fscanf(file, "%d %d %d \n",
-          &joystick[i].yupper, &joystick[i].ymiddle, &joystick[i].ylower);
-  }
   fclose(file);
 
-  CheckJoystickData();
-#else
-  load_joystick_data(JOYDAT_FILE);
-#endif
-}
-
-void SaveJoystickData()
-{
-  int i;
-  FILE *file;
-
-  if (joystick_status==JOYSTICK_OFF)
-    return;
-
-#ifndef MSDOS
-  CheckJoystickData();
-
-  if (!(file=fopen(JOYDAT_FILE,"w")))
-  {
-    Error(ERR_WARN, "cannot save joystick calibration data to file '%s'",
-         JOYDAT_FILE);
-    return;
-  }
-
-  fprintf(file,"%s\n",JOYSTICK_COOKIE);        /* Formatkennung */
-  for(i=0;i<2;i++)
-  {
-    fprintf(file,"JOYSTICK_%d_DATA\n",i);
-    fprintf(file, "%d %d %d \n",
-           joystick[i].xleft, joystick[i].xmiddle, joystick[i].xright);
-    fprintf(file, "%d %d %d \n",
-           joystick[i].yupper, joystick[i].ymiddle, joystick[i].ylower);
-  }
-  fclose(file);
-
-  chmod(JOYDAT_FILE, JOYDAT_PERMS);
-#else
-  save_joystick_data(JOYDAT_FILE);
-#endif
-
+  chmod(filename, SCORE_PERMS);
 }
 
-/* ------------------------------------------------------------------------- */
-/* new setup functions                                                       */
-/* ------------------------------------------------------------------------- */
-
-#define MAX_LINE_LEN                   1000
-#define MAX_SETUP_TOKEN_LEN            100
-#define MAX_SETUP_VALUE_LEN            100
-
 #define TOKEN_STR_FILE_IDENTIFIER      "file_identifier"
 #define TOKEN_STR_LAST_LEVEL_SERIES    "last_level_series"
-#define TOKEN_STR_ALIAS_NAME           "alias_name"
-
+#define TOKEN_STR_LAST_PLAYED_LEVEL    "last_played_level"
+#define TOKEN_STR_HANDICAP_LEVEL       "handicap_level"
 #define TOKEN_STR_PLAYER_PREFIX                "player_"
+
 #define TOKEN_VALUE_POSITION           30
-#define TOKEN_INVALID                  -1
-#define TOKEN_IGNORE                   -99
-
-#define SETUP_TOKEN_ALIAS_NAME         100
-
-#define SETUP_TOKEN_SOUND              0
-#define SETUP_TOKEN_SOUND_LOOPS                1
-#define SETUP_TOKEN_SOUND_MUSIC                2
-#define SETUP_TOKEN_SOUND_SIMPLE       3
-#define SETUP_TOKEN_TOONS              4
-#define SETUP_TOKEN_DIRECT_DRAW                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_USE_JOYSTICK       11
-#define SETUP_TOKEN_JOYSTICK_NR                12
-#define SETUP_TOKEN_JOY_SNAP           13
-#define SETUP_TOKEN_JOY_BOMB           14
-#define SETUP_TOKEN_KEY_LEFT           15
-#define SETUP_TOKEN_KEY_RIGHT          16
-#define SETUP_TOKEN_KEY_UP             17
-#define SETUP_TOKEN_KEY_DOWN           18
-#define SETUP_TOKEN_KEY_SNAP           19
-#define SETUP_TOKEN_KEY_BOMB           20
-
-#define NUM_SETUP_TOKENS               21
 
+/* 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
+
+#if 0
+#define SETUP_TOKEN_TOONS              5
+#define SETUP_TOKEN_DOUBLE_BUFFERING   6
+#endif
+
+#define SETUP_TOKEN_SCROLL_DELAY       5
+#define SETUP_TOKEN_SOFT_SCROLLING     6
+#define SETUP_TOKEN_FADING             7
+#define SETUP_TOKEN_AUTORECORD         8
+#define SETUP_TOKEN_QUICK_DOORS                9
+#define SETUP_TOKEN_TEAM_MODE          10
+#define SETUP_TOKEN_HANDICAP           11
+#define SETUP_TOKEN_TIME_LIMIT         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_NAME_SHORT     30
+#define LEVELINFO_TOKEN_NAME_SORTING   31
+#define LEVELINFO_TOKEN_AUTHOR         32
+#define LEVELINFO_TOKEN_IMPORTED_FROM  33
+#define LEVELINFO_TOKEN_LEVELS         34
+#define LEVELINFO_TOKEN_FIRST_LEVEL    35
+#define LEVELINFO_TOKEN_SORT_PRIORITY  36
+#define LEVELINFO_TOKEN_READONLY       37
+
+#define FIRST_GLOBAL_SETUP_TOKEN       SETUP_TOKEN_PLAYER_NAME
+#define LAST_GLOBAL_SETUP_TOKEN                SETUP_TOKEN_TIME_LIMIT
+
+#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
 {
-  char *token, *value_true, *value_false;
-} setup_info[] =
+  int type;
+  void *value;
+  char *text;
+} token_info[] =
 {
-  { "sound",                   "on", "off" },
-  { "repeating_sound_loops",   "on", "off" },
-  { "background_music",                "on", "off" },
-  { "simple_sound_effects",    "on", "off" },
-  { "toons",                   "on", "off" },
-  { "double_buffering",        "off", "on" },
-  { "scroll_delay",            "on", "off" },
-  { "soft_scrolling",          "on", "off" },
-  { "screen_fading",           "on", "off" },
-  { "automatic_tape_recording",        "on", "off" },
-  { "quick_doors",             "on", "off" },
-
-  /* for each player: */
-  { ".use_joystick",           "true", "false" },
-  { ".joystick_device",                "second", "first" },
-  { ".joy.snap_field",         "", "" },
-  { ".joy.place_bomb",         "", "" },
-  { ".key.move_left",          "", "" },
-  { ".key.move_right",         "", "" },
-  { ".key.move_up",            "", "" },
-  { ".key.move_down",          "", "" },
-  { ".key.snap_field",         "", "" },
-  { ".key.place_bomb",         "", "" }
+  /* 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"          },
+
+#if 0
+  { TYPE_SWITCH,  &si.toons,           "toons"                         },
+  { TYPE_SWITCH,  &si.double_buffering,        "double_buffering"              },
+#endif
+
+  { 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"                    },
+
+  /* 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.name_short,     "name_short"                    },
+  { TYPE_STRING,  &ldi.name_sorting,   "name_sorting"                  },
+  { TYPE_STRING,  &ldi.author,         "author"                        },
+  { TYPE_STRING,  &ldi.imported_from,  "imported_from"                 },
+  { 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)
@@ -655,7 +1187,7 @@ static int get_string_integer_value(char *s)
       if (strcmp(string_tolower(s), number_text[i][j]) == 0)
        return i;
 
-  return -1;
+  return atoi(s);
 }
 
 static boolean get_string_boolean_value(char *s)
@@ -669,19 +1201,6 @@ static boolean get_string_boolean_value(char *s)
     return FALSE;
 }
 
-static char *getSetupToken(int token_nr)
-{
-  return setup_info[token_nr].token;
-}
-
-static char *getSetupValue(int token_nr, boolean token_value)
-{
-  if (token_value == TRUE)
-    return setup_info[token_nr].value_true;
-  else
-    return setup_info[token_nr].value_false;
-}
-
 static char *getFormattedSetupEntry(char *token, char *value)
 {
   int i;
@@ -697,48 +1216,6 @@ static char *getFormattedSetupEntry(char *token, char *value)
   return entry;
 }
 
-static char *getSetupEntry(char *prefix, int token_nr, int token_value)
-{
-  int i;
-  static char entry[MAX_LINE_LEN];
-
-  sprintf(entry, "%s%s:", prefix, getSetupToken(token_nr));
-  for (i=strlen(entry); i<TOKEN_VALUE_POSITION; i++)
-    entry[i] = ' ';
-  entry[i] = '\0';
-
-  strcat(entry, getSetupValue(token_nr, token_value));
-
-  return entry;
-}
-
-static char *getSetupEntryWithComment(char *prefix,int token_nr, KeySym keysym)
-{
-  int i;
-  static char entry[MAX_LINE_LEN];
-  char *keyname = getKeyNameFromKeySym(keysym);
-
-  sprintf(entry, "%s%s:", prefix, getSetupToken(token_nr));
-  for (i=strlen(entry); i<TOKEN_VALUE_POSITION; i++)
-    entry[i] = ' ';
-  entry[i] = '\0';
-
-  strcat(entry, getX11KeyNameFromKeySym(keysym));
-  for (i=strlen(entry); i<50; i++)
-    entry[i] = ' ';
-  entry[i] = '\0';
-
-  /* add comment, if useful */
-  if (strcmp(keyname, "(undefined)") != 0 &&
-      strcmp(keyname, "(unknown)") != 0)
-  {
-    strcat(entry, "# ");
-    strcat(entry, keyname);
-  }
-
-  return entry;
-}
-
 static void freeSetupFileList(struct SetupFileList *setup_file_list)
 {
   if (!setup_file_list)
@@ -768,8 +1245,8 @@ static struct SetupFileList *newSetupFileList(char *token, char *value)
   return new;
 }
 
-static char *getSetupFileListEntry(struct SetupFileList *setup_file_list,
-                                  char *token)
+static char *getTokenValue(struct SetupFileList *setup_file_list,
+                          char *token)
 {
   if (!setup_file_list)
     return NULL;
@@ -777,44 +1254,25 @@ static char *getSetupFileListEntry(struct SetupFileList *setup_file_list,
   if (strcmp(setup_file_list->token, token) == 0)
     return setup_file_list->value;
   else
-    return getSetupFileListEntry(setup_file_list->next, token);
+    return getTokenValue(setup_file_list->next, token);
 }
 
-boolean setSetupFileListEntry(struct SetupFileList *setup_file_list,
-                             char *token, char *value)
+static void setTokenValue(struct SetupFileList *setup_file_list,
+                         char *token, char *value)
 {
   if (!setup_file_list)
-    return FALSE;
+    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);
-
-    return TRUE;
   }
+  else if (setup_file_list->next == NULL)
+    setup_file_list->next = newSetupFileList(token, value);
   else
-    return setSetupFileListEntry(setup_file_list->next, token, value);
-}
-
-void updateSetupFileListEntry(struct SetupFileList *setup_file_list,
-                             char *token, char *value)
-{
-  if (!setup_file_list)
-    return;
-
-  if (getSetupFileListEntry(setup_file_list, token) != NULL)
-    setSetupFileListEntry(setup_file_list, token, value);
-  else
-  {
-    struct SetupFileList *list_entry = setup_file_list;
-
-    while (list_entry->next)
-      list_entry = list_entry->next;
-
-    list_entry->next = newSetupFileList(token, value);
-  }
+    setTokenValue(setup_file_list->next, token, value);
 }
 
 #ifdef DEBUG
@@ -838,18 +1296,11 @@ static struct SetupFileList *loadSetupFileList(char *filename)
   struct SetupFileList *setup_file_list = newSetupFileList("", "");
   struct SetupFileList *first_valid_list_entry;
 
-
-
-  /*
-  struct SetupFileList **next_entry = &setup_file_list;
-  */
-
-
   FILE *file;
 
   if (!(file = fopen(filename, "r")))
   {
-    Error(ERR_WARN, "cannot open setup file '%s'", filename);
+    Error(ERR_WARN, "cannot open configuration file '%s'", filename);
     return NULL;
   }
 
@@ -862,7 +1313,7 @@ static struct SetupFileList *loadSetupFileList(char *filename)
     /* cut trailing comment or whitespace from input line */
     for (line_ptr = line; *line_ptr; line_ptr++)
     {
-      if (*line_ptr == '#' || *line_ptr == '\n')
+      if (*line_ptr == '#' || *line_ptr == '\n' || *line_ptr == '\r')
       {
        *line_ptr = '\0';
        break;
@@ -906,20 +1357,7 @@ static struct SetupFileList *loadSetupFileList(char *filename)
        break;
 
     if (*token && *value)
-      updateSetupFileListEntry(setup_file_list, token, value);
-
-
-#if 0
-    {
-      /* allocate new token/value pair */
-
-      *next_entry = newSetupFileList(token, value);
-      next_entry = &((*next_entry)->next);
-    }
-#endif
-
-
-
+      setTokenValue(setup_file_list, token, value);
   }
 
   fclose(file);
@@ -930,8 +1368,8 @@ static struct SetupFileList *loadSetupFileList(char *filename)
   setup_file_list->next = NULL;
   freeSetupFileList(setup_file_list);
 
-  if (!first_valid_list_entry)
-    Error(ERR_WARN, "setup file is empty");
+  if (first_valid_list_entry == NULL)
+    Error(ERR_WARN, "configuration file '%s' is empty", filename);
 
   return first_valid_list_entry;
 }
@@ -946,7 +1384,7 @@ static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
   {
     if (strcmp(setup_file_list->value, identifier) != 0)
     {
-      Error(ERR_WARN, "setup file has wrong version");
+      Error(ERR_WARN, "configuration file has wrong version");
       return;
     }
     else
@@ -957,409 +1395,755 @@ static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
     checkSetupFileListIdentifier(setup_file_list->next, identifier);
   else
   {
-    Error(ERR_WARN, "setup file has no version information");
+    Error(ERR_WARN, "configuration file has no version information");
     return;
   }
 }
 
-static void decodeSetupFileList(struct SetupFileList *setup_file_list)
+static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi)
 {
-  int i;
-  int token_nr = TOKEN_INVALID;
-  int player_nr = 0;
-  char *token;
-  char *token_value;
-  int token_integer_value;
-  boolean token_boolean_value;
-  int token_player_prefix_len;
-
-  if (!setup_file_list)
-    return;
+  ldi->filename = NULL;
+  ldi->name = getStringCopy(ANONYMOUS_NAME);
+  ldi->name_short = NULL;
+  ldi->name_sorting = NULL;
+  ldi->author = getStringCopy(ANONYMOUS_NAME);
+  ldi->imported_from = NULL;
+  ldi->levels = 0;
+  ldi->first_level = 0;
+  ldi->last_level = 0;
+  ldi->sort_priority = LEVELCLASS_UNDEFINED;   /* default: least priority */
+  ldi->readonly = TRUE;
+  ldi->user_defined = FALSE;
+  ldi->color = 0;
+  ldi->class_desc = NULL;
+  ldi->handicap_level = 0;
+}
 
-  token = setup_file_list->token;
-  token_value = setup_file_list->value;
-  token_integer_value = get_string_integer_value(token_value);
-  token_boolean_value = get_string_boolean_value(token_value);
+static void setSetupInfoToDefaults(struct SetupInfo *si)
+{
+  int i;
 
-  token_player_prefix_len = strlen(TOKEN_STR_PLAYER_PREFIX);
+  si->player_name = getStringCopy(getLoginName());
+
+  si->sound = TRUE;
+  si->sound_loops = TRUE;
+  si->sound_music = TRUE;
+  si->sound_simple = TRUE;
+  si->toons = TRUE;
+  si->double_buffering = TRUE;
+  si->direct_draw = !si->double_buffering;
+  si->scroll_delay = TRUE;
+  si->soft_scrolling = TRUE;
+  si->fading = FALSE;
+  si->autorecord = TRUE;
+  si->quick_doors = FALSE;
+  si->team_mode = FALSE;
+  si->handicap = TRUE;
+  si->time_limit = TRUE;
 
-  if (strncmp(token, TOKEN_STR_PLAYER_PREFIX,
-             token_player_prefix_len) == 0)
+  for (i=0; i<MAX_PLAYERS; i++)
   {
-    token += token_player_prefix_len;
-
-    if (*token >= '0' && *token <= '9')
-    {
-      player_nr = ((int)(*token - '0') - 1 + MAX_PLAYERS) % MAX_PLAYERS;
-      token++;
-    }
+    si->input[i].use_joystick = FALSE;
+    si->input[i].joy.device_name = getStringCopy(joystick_device_name[i]);
+    si->input[i].joy.xleft   = JOYSTICK_XLEFT;
+    si->input[i].joy.xmiddle = JOYSTICK_XMIDDLE;
+    si->input[i].joy.xright  = JOYSTICK_XRIGHT;
+    si->input[i].joy.yupper  = JOYSTICK_YUPPER;
+    si->input[i].joy.ymiddle = JOYSTICK_YMIDDLE;
+    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);
   }
+}
 
-  for (i=0; i<NUM_SETUP_TOKENS; i++)
-  {
-    if (strcmp(token, setup_info[i].token) == 0)
-    {
-      token_nr = i;
-      break;
-    }
-  }
+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 (strcmp(token, TOKEN_STR_FILE_IDENTIFIER) == 0)
-    token_nr = TOKEN_IGNORE;
-  else if (strcmp(token, TOKEN_STR_ALIAS_NAME) == 0)
-    token_nr = SETUP_TOKEN_ALIAS_NAME;
+  if (token_value == NULL)
+    return;
 
-  switch (token_nr)
+  /* set setup field to corresponding token value */
+  switch (token_type)
   {
-    case SETUP_TOKEN_SOUND:
-      setup.sound_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SOUND_LOOPS:
-      setup.sound_loops_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SOUND_MUSIC:
-      setup.sound_music_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SOUND_SIMPLE:
-      setup.sound_simple_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_TOONS:
-      setup.toons_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_DIRECT_DRAW:
-      setup.direct_draw_on = !token_boolean_value;
-      break;
-    case SETUP_TOKEN_SCROLL_DELAY:
-      setup.scroll_delay_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SOFT_SCROLLING:
-      setup.soft_scrolling_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_FADING:
-      setup.fading_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_AUTORECORD:
-      setup.autorecord_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_QUICK_DOORS:
-      setup.quick_doors = token_boolean_value;
+    case TYPE_BOOLEAN:
+    case TYPE_SWITCH:
+      *(boolean *)setup_value = get_string_boolean_value(token_value);
       break;
 
-    case SETUP_TOKEN_USE_JOYSTICK:
-      setup.input[player_nr].use_joystick = token_boolean_value;
-      break;
-    case SETUP_TOKEN_JOYSTICK_NR:
-      if (token_integer_value < 0 || token_integer_value > 1)
-       token_integer_value = 1;
-      setup.input[player_nr].joystick_nr = token_integer_value - 1;
-      break;
-    case SETUP_TOKEN_JOY_SNAP:
-      setup.input[player_nr].joy.snap = getJoySymbolFromJoyName(token_value);
-      break;
-    case SETUP_TOKEN_JOY_BOMB    :
-      setup.input[player_nr].joy.bomb = getJoySymbolFromJoyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_LEFT:
-      setup.input[player_nr].key.left = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_RIGHT:
-      setup.input[player_nr].key.right = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_UP:
-      setup.input[player_nr].key.up = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_DOWN:
-      setup.input[player_nr].key.down = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_SNAP:
-      setup.input[player_nr].key.snap = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_BOMB:
-      setup.input[player_nr].key.bomb = getKeySymFromX11KeyName(token_value);
+    case TYPE_KEYSYM:
+      *(KeySym *)setup_value = getKeySymFromX11KeyName(token_value);
       break;
 
-    case SETUP_TOKEN_ALIAS_NAME:
-      strncpy(local_player->alias_name, token_value, MAX_NAMELEN-1);
-      local_player->alias_name[MAX_NAMELEN-1] = '\0';
+    case TYPE_INTEGER:
+      *(int *)setup_value = get_string_integer_value(token_value);
       break;
 
-    case TOKEN_INVALID:
-      Error(ERR_WARN, "unknown token '%s' not recognized", token);
+    case TYPE_STRING:
+      if (*(char **)setup_value != NULL)
+       free(*(char **)setup_value);
+      *(char **)setup_value = getStringCopy(token_value);
       break;
 
-    case TOKEN_IGNORE:
     default:
       break;
   }
+}
 
-  decodeSetupFileList(setup_file_list->next);
+static void decodeSetupFileList(struct SetupFileList *setup_file_list)
+{
+  int i, pnr;
+
+  if (!setup_file_list)
+    return;
+
+  /* handle global setup values */
+  si = setup;
+  for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++)
+    setSetupInfo(i, getTokenValue(setup_file_list, token_info[i].text));
+  setup = si;
+
+  /* handle player specific setup values */
+  for (pnr=0; pnr<MAX_PLAYERS; pnr++)
+  {
+    char prefix[30];
+
+    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++)
+    {
+      char full_token[100];
+
+      sprintf(full_token, "%s%s", prefix, token_info[i].text);
+      setSetupInfo(i, getTokenValue(setup_file_list, full_token));
+    }
+    setup.input[pnr] = sii;
+  }
 }
 
-void LoadSetup()
+int getLevelSeriesNrFromLevelSeriesName(char *level_series_name)
 {
   int i;
-  char filename[MAX_FILENAME_LEN];
-  struct SetupFileList *setup_file_list = NULL;
 
-  /* always start with reliable default setup values */
+  if (!level_series_name)
+    return 0;
 
-  strncpy(local_player->login_name, GetLoginName(), MAX_NAMELEN-1);
-  local_player->login_name[MAX_NAMELEN-1] = '\0';
+  for (i=0; i<num_leveldirs; i++)
+    if (strcmp(level_series_name, leveldir[i].filename) == 0)
+      return i;
 
-  strncpy(local_player->alias_name, GetLoginName(), MAX_NAMELEN-1);
-  local_player->alias_name[MAX_NAMELEN-1] = '\0';
+  return 0;
+}
 
-  setup.sound_on = TRUE;
-  setup.sound_loops_on = FALSE;
-  setup.sound_music_on = FALSE;
-  setup.sound_simple_on = FALSE;
-  setup.toons_on = TRUE;
-  setup.direct_draw_on = FALSE;
-  setup.scroll_delay_on = FALSE;
-  setup.soft_scrolling_on = TRUE;
-  setup.fading_on = FALSE;
-  setup.autorecord_on = FALSE;
-  setup.quick_doors = FALSE;
+static int compareLevelDirInfoEntries(const void *object1, const void *object2)
+{
+  const struct LevelDirInfo *entry1 = object1;
+  const struct LevelDirInfo *entry2 = object2;
+  int compare_result;
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  if (entry1->sort_priority == entry2->sort_priority)
   {
-    setup.input[i].use_joystick = FALSE;
-    setup.input[i].joystick_nr = 0;
-    setup.input[i].joy.snap  = (i == 0 ? JOY_BUTTON_1 : 0);
-    setup.input[i].joy.bomb  = (i == 0 ? JOY_BUTTON_2 : 0);
-    setup.input[i].key.left  = (i == 0 ? DEFAULT_KEY_LEFT  : KEY_UNDEFINDED);
-    setup.input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KEY_UNDEFINDED);
-    setup.input[i].key.up    = (i == 0 ? DEFAULT_KEY_UP    : KEY_UNDEFINDED);
-    setup.input[i].key.down  = (i == 0 ? DEFAULT_KEY_DOWN  : KEY_UNDEFINDED);
-    setup.input[i].key.snap  = (i == 0 ? DEFAULT_KEY_SNAP  : KEY_UNDEFINDED);
-    setup.input[i].key.bomb  = (i == 0 ? DEFAULT_KEY_BOMB  : KEY_UNDEFINDED);
+    char *name1 = getStringToLower(entry1->name_sorting);
+    char *name2 = getStringToLower(entry2->name_sorting);
+
+    compare_result = strcmp(name1, name2);
+
+    free(name1);
+    free(name2);
   }
+  else if (LEVELSORTING(entry1) == LEVELSORTING(entry2))
+    compare_result = entry1->sort_priority - entry2->sort_priority;
+  else
+    compare_result = LEVELSORTING(entry1) - LEVELSORTING(entry2);
 
-  sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
+  return compare_result;
+}
 
-  setup_file_list = loadSetupFileList(filename);
+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 (setup_file_list)
+  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)
+    {
 #if 0
-    printSetupFileList(setup_file_list);
+      DrawInitText(dir_entry->d_name, 150, FC_YELLOW);
 #endif
 
-    checkSetupFileListIdentifier(setup_file_list, SETUP_COOKIE);
-    decodeSetupFileList(setup_file_list);
+      checkSetupFileListIdentifier(setup_file_list, LEVELINFO_COOKIE);
+      setLevelDirInfoToDefaults(&leveldir[current_entry]);
 
-    freeSetupFileList(setup_file_list);
+      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;
+
+#if 1
+      DrawInitText(leveldir[current_entry].name, 150, FC_YELLOW);
+#endif
+
+      if (leveldir[current_entry].name_short == NULL)
+       leveldir[current_entry].name_short =
+         getStringCopy(leveldir[current_entry].name);
+
+      if (leveldir[current_entry].name_sorting == NULL)
+       leveldir[current_entry].name_sorting =
+         getStringCopy(leveldir[current_entry].name_short);
+
+      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(&leveldir[current_entry]);
+      leveldir[current_entry].class_desc =
+       getLevelClassDescription(&leveldir[current_entry]);
+#if 0
+      leveldir[current_entry].handicap_level =
+       leveldir[current_entry].first_level;    /* default value */
+#else
+      leveldir[current_entry].handicap_level =
+       (leveldir[current_entry].user_defined ?
+        leveldir[current_entry].last_level :
+        leveldir[current_entry].first_level);
+#endif
+
+      freeSetupFileList(setup_file_list);
+      current_entry++;
+    }
+    else
+      Error(ERR_WARN, "ignoring level directory '%s'", directory);
+
+    free(directory);
+    free(filename);
   }
-  else
-    Error(ERR_RETURN, "using default setup values");
+
+  closedir(dir);
+
+  if (current_entry == MAX_LEVDIR_ENTRIES)
+  {
+    Error(ERR_WARN, "maximum of %d level directories reached", current_entry);
+    Error(ERR_WARN, "remaining level directories ignored in directory '%s'",
+         level_directory);
+  }
+  else if (current_entry == start_entry)
+    Error(ERR_WARN, "cannot find any valid level series in directory '%s'",
+         level_directory);
+
+  return current_entry;
 }
 
-void LoadLevelSetup()
+void LoadLevelInfo()
 {
-  char filename[MAX_FILENAME_LEN];
-
-  /* always start with reliable default setup values */
+  InitUserLevelDirectory(getLoginName());
 
+  num_leveldirs = 0;
   leveldir_nr = 0;
-  level_nr = 0;
 
-  sprintf(filename, "%s/%s", SETUP_PATH, LEVELSETUP_FILENAME);
+  DrawInitText("Loading level series:", 120, FC_GREEN);
 
-  if (level_setup_list)
-    freeSetupFileList(level_setup_list);
+  num_leveldirs = LoadLevelInfoFromLevelDir(options.level_directory,
+                                           num_leveldirs);
+  num_leveldirs = LoadLevelInfoFromLevelDir(getUserLevelDir(""),
+                                           num_leveldirs);
 
-  level_setup_list = loadSetupFileList(filename);
+  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);
+}
 
-  if (level_setup_list)
+static void SaveUserLevelInfo()
+{
+  char *filename;
+  FILE *file;
+  int i;
+
+  filename = getPath2(getUserLevelDir(getLoginName()), LEVELINFO_FILENAME);
+
+  if (!(file = fopen(filename, "w")))
   {
-    int i;
+    Error(ERR_WARN, "cannot write level info file '%s'", filename);
+    free(filename);
+    return;
+  }
 
-    char *last_level_series =
-      getSetupFileListEntry(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES);
+  /* 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;
 
-    if (last_level_series)
+  fprintf(file, "%s\n\n",
+         getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, LEVELINFO_COOKIE));
+
+  for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++)
+    if (i != LEVELINFO_TOKEN_NAME_SHORT &&
+       i != LEVELINFO_TOKEN_NAME_SORTING &&
+       i != LEVELINFO_TOKEN_IMPORTED_FROM)
+      fprintf(file, "%s\n", getSetupLine("", i));
+
+  fclose(file);
+  free(filename);
+
+  chmod(filename, SETUP_PERMS);
+}
+
+void LoadSetup()
+{
+  char *filename;
+  struct SetupFileList *setup_file_list = NULL;
+
+  /* always start with reliable default values */
+  setSetupInfoToDefaults(&setup);
+
+  filename = getPath2(getSetupDir(), SETUP_FILENAME);
+
+  setup_file_list = loadSetupFileList(filename);
+
+  if (setup_file_list)
+  {
+    checkSetupFileListIdentifier(setup_file_list, SETUP_COOKIE);
+    decodeSetupFileList(setup_file_list);
+
+    setup.direct_draw = !setup.double_buffering;
+
+    freeSetupFileList(setup_file_list);
+
+    /* 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)
     {
-      for (i=0; i<num_leveldirs; i++)
-      {
-       if (strcmp(last_level_series, leveldir[i].filename) == 0)
-       {
-         char *token_value =
-           getSetupFileListEntry(level_setup_list, last_level_series);
+      char *new_name = checked_malloc(MAX_PLAYER_NAME_LEN + 1);
 
-         leveldir_nr = i;
+      strcpy(new_name, setup.player_name);
+      free(setup.player_name);
+      setup.player_name = new_name;
+    }
+  }
+  else
+    Error(ERR_WARN, "using default setup values");
 
-         if (token_value)
-         {
-           level_nr = atoi(token_value);
+  free(filename);
+}
 
-           if (level_nr < 0)
-             level_nr = 0;
-           if (level_nr > leveldir[leveldir_nr].levels - 1)
-             level_nr = leveldir[leveldir_nr].levels - 1;
-         }
+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;
 
-         break;
+  /* 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];
 
-#if 0
-    printSetupFileList(level_setup_list);
-#endif
+       sprintf(buffer, "%d", *(int *)setup_value);
+       strcat(entry, buffer);
+      }
+      break;
 
-    checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
+    case TYPE_STRING:
+      strcat(entry, *(char **)setup_value);
+      break;
+
+    default:
+      break;
   }
-  else
-    Error(ERR_RETURN, "using default setup values");
+
+  return entry;
 }
 
 void SaveSetup()
 {
-  int i;
-  char filename[MAX_FILENAME_LEN];
+  int i, pnr;
+  char *filename;
   FILE *file;
 
-  sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
+  InitUserDataDirectory();
+
+  filename = getPath2(getSetupDir(), SETUP_FILENAME);
 
   if (!(file = fopen(filename, "w")))
   {
     Error(ERR_WARN, "cannot write setup file '%s'", filename);
+    free(filename);
     return;
   }
 
-  fprintf(file, "%s:              %s\n",
-         TOKEN_STR_FILE_IDENTIFIER, SETUP_COOKIE);
-
-  fprintf(file, "\n");
-
-  fprintf(file, "%s\n",
-         getSetupEntry("", SETUP_TOKEN_SOUND,
-                       setup.sound_on));
-  fprintf(file, "%s\n",
-         getSetupEntry("", SETUP_TOKEN_SOUND_LOOPS,
-                       setup.sound_loops_on));
-  fprintf(file, "%s\n",
-         getSetupEntry("", SETUP_TOKEN_SOUND_MUSIC,
-                       setup.sound_music_on));
-  fprintf(file, "%s\n",
-         getSetupEntry("", SETUP_TOKEN_SOUND_SIMPLE,
-                       setup.sound_simple_on));
-  fprintf(file, "%s\n",
-         getSetupEntry("", SETUP_TOKEN_TOONS,
-                       setup.toons_on));
-  fprintf(file, "%s\n",
-         getSetupEntry("", SETUP_TOKEN_DIRECT_DRAW,
-                       setup.direct_draw_on));
-  fprintf(file, "%s\n",
-         getSetupEntry("", SETUP_TOKEN_SCROLL_DELAY,
-                       setup.scroll_delay_on));
-  fprintf(file, "%s\n",
-         getSetupEntry("", SETUP_TOKEN_SOFT_SCROLLING,
-                       setup.soft_scrolling_on));
   fprintf(file, "%s\n",
-         getSetupEntry("", SETUP_TOKEN_FADING,
-                       setup.fading_on));
-  fprintf(file, "%s\n",
-         getSetupEntry("", SETUP_TOKEN_AUTORECORD,
-                       setup.autorecord_on));
-  fprintf(file, "%s\n",
-         getSetupEntry("", SETUP_TOKEN_QUICK_DOORS,
-                       setup.quick_doors));
-
+         getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, SETUP_COOKIE));
   fprintf(file, "\n");
 
-  fprintf(file, "%s\n",
-         getFormattedSetupEntry(TOKEN_STR_ALIAS_NAME,
-                                local_player->alias_name));
+  /* handle global setup values */
+  si = setup;
+  for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++)
+  {
+    fprintf(file, "%s\n", getSetupLine("", i));
 
-  for (i=0; i<MAX_PLAYERS; i++)
+    /* just to make things nicer :) */
+    if (i == SETUP_TOKEN_PLAYER_NAME)
+      fprintf(file, "\n");
+  }
+
+  /* handle player specific setup values */
+  for (pnr=0; pnr<MAX_PLAYERS; pnr++)
   {
     char prefix[30];
 
-    sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, i + 1);
-
+    sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, pnr + 1);
     fprintf(file, "\n");
 
-    fprintf(file, "%s\n",
-           getSetupEntry(prefix, SETUP_TOKEN_USE_JOYSTICK,
-                         setup.input[i].use_joystick));
-    fprintf(file, "%s\n",
-           getSetupEntry(prefix, SETUP_TOKEN_JOYSTICK_NR,
-                         setup.input[i].joystick_nr));
-
-    fprintf(file, "%s%s:      %s\n", prefix,
-           getSetupToken(SETUP_TOKEN_JOY_SNAP),
-           getJoyNameFromJoySymbol(setup.input[i].joy.snap));
-    fprintf(file, "%s%s:      %s\n", prefix,
-           getSetupToken(SETUP_TOKEN_JOY_BOMB),
-           getJoyNameFromJoySymbol(setup.input[i].joy.bomb));
-
-    fprintf(file, "%s\n",
-           getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_LEFT,
-                                    setup.input[i].key.left));
-    fprintf(file, "%s\n",
-           getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_RIGHT,
-                                    setup.input[i].key.right));
-    fprintf(file, "%s\n",
-           getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_UP,
-                                    setup.input[i].key.up));
-    fprintf(file, "%s\n",
-           getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_DOWN,
-                                    setup.input[i].key.down));
-    fprintf(file, "%s\n",
-           getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_SNAP,
-                                    setup.input[i].key.snap));
-    fprintf(file, "%s\n",
-           getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_BOMB,
-                                    setup.input[i].key.bomb));
+    sii = setup.input[pnr];
+    for (i=FIRST_PLAYER_SETUP_TOKEN; i<=LAST_PLAYER_SETUP_TOKEN; i++)
+      fprintf(file, "%s\n", getSetupLine(prefix, i));
   }
 
   fclose(file);
+  free(filename);
 
   chmod(filename, SETUP_PERMS);
 }
 
-void SaveLevelSetup()
+void LoadLevelSetup_LastSeries()
+{
+  char *filename;
+  struct SetupFileList *level_setup_list = NULL;
+
+  /* always start with reliable default values */
+  leveldir_nr = 0;
+
+  /* ----------------------------------------------------------------------- */
+  /* ~/.rocksndiamonds/levelsetup.conf                                       */
+  /* ----------------------------------------------------------------------- */
+
+  filename = getPath2(getSetupDir(), LEVELSETUP_FILENAME);
+
+  if ((level_setup_list = loadSetupFileList(filename)))
+  {
+    char *last_level_series =
+      getTokenValue(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES);
+
+    leveldir_nr = getLevelSeriesNrFromLevelSeriesName(last_level_series);
+
+    checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
+
+    freeSetupFileList(level_setup_list);
+  }
+  else
+    Error(ERR_WARN, "using default setup values");
+
+  free(filename);
+}
+
+void SaveLevelSetup_LastSeries()
 {
-  char filename[MAX_FILENAME_LEN];
-  struct SetupFileList *list_entry = level_setup_list;
+  char *filename;
+  char *level_subdir = leveldir[leveldir_nr].filename;
   FILE *file;
 
-  updateSetupFileListEntry(level_setup_list,
-                          TOKEN_STR_LAST_LEVEL_SERIES,
-                          leveldir[leveldir_nr].filename);
+  /* ----------------------------------------------------------------------- */
+  /* ~/.rocksndiamonds/levelsetup.conf                                       */
+  /* ----------------------------------------------------------------------- */
 
-  updateSetupFileListEntry(level_setup_list,
-                          leveldir[leveldir_nr].filename,
-                          int2str(level_nr, 0));
+  InitUserDataDirectory();
 
-  sprintf(filename, "%s/%s", SETUP_PATH, LEVELSETUP_FILENAME);
+  filename = getPath2(getSetupDir(), LEVELSETUP_FILENAME);
 
   if (!(file = fopen(filename, "w")))
   {
     Error(ERR_WARN, "cannot write setup file '%s'", filename);
+    free(filename);
     return;
   }
 
-  fprintf(file, "%s:              %s\n\n",
-         TOKEN_STR_FILE_IDENTIFIER, LEVELSETUP_COOKIE);
+  fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
+                                                LEVELSETUP_COOKIE));
+  fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_LAST_LEVEL_SERIES,
+                                              level_subdir));
+
+  fclose(file);
+  free(filename);
+
+  chmod(filename, SETUP_PERMS);
+}
 
-  while (list_entry)
+static void checkSeriesInfo(int leveldir_nr)
+{
+  static char *level_directory = NULL;
+  DIR *dir;
+  struct dirent *dir_entry;
+
+  /* check for more levels besides the 'levels' field of 'levelinfo.conf' */
+
+  level_directory = getPath2((leveldir[leveldir_nr].user_defined ?
+                             getUserLevelDir("") :
+                             options.level_directory),
+                            leveldir[leveldir_nr].filename);
+
+  if ((dir = opendir(level_directory)) == NULL)
   {
-    if (strcmp(list_entry->token, TOKEN_STR_FILE_IDENTIFIER) != 0)
-      fprintf(file, "%s\n",
-             getFormattedSetupEntry(list_entry->token, list_entry->value));
+    Error(ERR_WARN, "cannot read level directory '%s'", level_directory);
+    return;
+  }
 
-    /* just to make things nicer :) */
-    if (strcmp(list_entry->token, TOKEN_STR_LAST_LEVEL_SERIES) == 0)
-      fprintf(file, "\n");
+  while ((dir_entry = readdir(dir)) != NULL)   /* last directory entry */
+  {
+    if (strlen(dir_entry->d_name) > 4 &&
+       dir_entry->d_name[3] == '.' &&
+       strcmp(&dir_entry->d_name[4], LEVELFILE_EXTENSION) == 0)
+    {
+      char levelnum_str[4];
+      int levelnum_value;
 
-    list_entry = list_entry->next;
+      strncpy(levelnum_str, dir_entry->d_name, 3);
+      levelnum_str[3] = '\0';
+
+      levelnum_value = atoi(levelnum_str);
+
+      if (levelnum_value < leveldir[leveldir_nr].first_level)
+      {
+       Error(ERR_WARN, "additional level %d found", levelnum_value);
+       leveldir[leveldir_nr].first_level = levelnum_value;
+      }
+      else if (levelnum_value > leveldir[leveldir_nr].last_level)
+      {
+       Error(ERR_WARN, "additional level %d found", levelnum_value);
+       leveldir[leveldir_nr].last_level = levelnum_value;
+      }
+    }
   }
 
+  closedir(dir);
+}
+
+void LoadLevelSetup_SeriesInfo(int leveldir_nr)
+{
+  char *filename;
+  struct SetupFileList *level_setup_list = NULL;
+  char *level_subdir = leveldir[leveldir_nr].filename;
+
+  /* always start with reliable default values */
+#if 0
+  level_nr = 0;
+  leveldir[leveldir_nr].handicap_level = 0;
+#else
+  level_nr = leveldir[leveldir_nr].first_level;
+#endif
+
+  checkSeriesInfo(leveldir_nr);
+
+  /* ----------------------------------------------------------------------- */
+  /* ~/.rocksndiamonds/levelsetup/<level series>/levelsetup.conf             */
+  /* ----------------------------------------------------------------------- */
+
+  level_subdir = leveldir[leveldir_nr].filename;
+
+  filename = getPath2(getLevelSetupDir(level_subdir), LEVELSETUP_FILENAME);
+
+  if ((level_setup_list = loadSetupFileList(filename)))
+  {
+    char *token_value;
+
+    token_value = getTokenValue(level_setup_list, TOKEN_STR_LAST_PLAYED_LEVEL);
+
+    if (token_value)
+    {
+      level_nr = atoi(token_value);
+
+      if (level_nr < leveldir[leveldir_nr].first_level)
+       level_nr = leveldir[leveldir_nr].first_level;
+      if (level_nr > leveldir[leveldir_nr].last_level)
+       level_nr = leveldir[leveldir_nr].last_level;
+    }
+
+    token_value = getTokenValue(level_setup_list, TOKEN_STR_HANDICAP_LEVEL);
+
+    if (token_value)
+    {
+      int level_nr = atoi(token_value);
+
+      if (level_nr < leveldir[leveldir_nr].first_level)
+       level_nr = leveldir[leveldir_nr].first_level;
+      if (level_nr > leveldir[leveldir_nr].last_level + 1)
+       level_nr = leveldir[leveldir_nr].last_level;
+
+      if (leveldir[leveldir_nr].user_defined)
+       level_nr = leveldir[leveldir_nr].last_level;
+
+      leveldir[leveldir_nr].handicap_level = level_nr;
+    }
+
+    checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
+
+    freeSetupFileList(level_setup_list);
+  }
+  else
+    Error(ERR_WARN, "using default setup values");
+
+  free(filename);
+}
+
+void SaveLevelSetup_SeriesInfo(int leveldir_nr)
+{
+  char *filename;
+  char *level_subdir = leveldir[leveldir_nr].filename;
+  char *level_nr_str = int2str(level_nr, 0);
+  char *handicap_level_str = int2str(leveldir[leveldir_nr].handicap_level, 0);
+  FILE *file;
+
+  /* ----------------------------------------------------------------------- */
+  /* ~/.rocksndiamonds/levelsetup/<level series>/levelsetup.conf             */
+  /* ----------------------------------------------------------------------- */
+
+  InitLevelSetupDirectory(level_subdir);
+
+  filename = getPath2(getLevelSetupDir(level_subdir), LEVELSETUP_FILENAME);
+
+  if (!(file = fopen(filename, "w")))
+  {
+    Error(ERR_WARN, "cannot write setup file '%s'", filename);
+    free(filename);
+    return;
+  }
+
+  fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
+                                                LEVELSETUP_COOKIE));
+  fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_LAST_PLAYED_LEVEL,
+                                              level_nr_str));
+  fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_HANDICAP_LEVEL,
+                                              handicap_level_str));
+
   fclose(file);
+  free(filename);
 
   chmod(filename, SETUP_PERMS);
 }
+
+#ifdef MSDOS
+void initErrorFile()
+{
+  char *filename;
+
+  InitUserDataDirectory();
+
+  filename = getPath2(getUserDataDir(), ERROR_FILENAME);
+  unlink(filename);
+  free(filename);
+}
+
+FILE *openErrorFile()
+{
+  char *filename;
+  FILE *error_file;
+
+  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)
+  {
+    while (!feof(error_file))
+      fputc(fgetc(error_file), stderr);
+
+    fclose(error_file);
+  }
+}
+#endif