X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=87a60c1cc6112ad8546d4c8ad7587471b357d5d6;hb=0c2b6a7610933f9098ec233f7b4c2b52eac3535c;hp=a77b4463660c5821680defce31430e15ed4d09b7;hpb=d7d97176a88ee47f893055480c76b9c05a253d05;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index a77b4463..87a60c1c 100644
--- a/src/files.c
+++ b/src/files.c
@@ -12,6 +12,9 @@
 ***********************************************************/
 
 #include <ctype.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "files.h"
 #include "tools.h"
@@ -19,818 +22,940 @@
 #include "tape.h"
 #include "joystick.h"
 
-boolean CreateNewScoreFile()
-{
-  int i,j,k;
-  char filename[MAX_FILENAME_LEN];
-  char empty_alias[MAX_NAMELEN];
-  FILE *file;
-
-  sprintf(filename,"%s/%s/%s",
-	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+#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	18	/* 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 */
+
+/* file identifier strings */
+#define LEVEL_COOKIE		"ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.2"
+#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
 
-  if (!(file=fopen(filename,"w")))
-    return(FALSE);
+/* 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_UNDEFINED		999
+
+static void SaveUserLevelInfo();		/* for 'InitUserLevelDir()' */
+static char *getSetupLine(char *, int);		/* for 'SaveUserLevelInfo()' */
+
+static char *getGlobalDataDir()
+{
+  return GAME_DIR;
+}
 
-  for(i=0;i<MAX_NAMELEN;i++)
-    empty_alias[i] = 0;
-  strncpy(empty_alias,EMPTY_ALIAS,MAX_NAMELEN-1);
+char *getUserDataDir()
+{
+  static char *userdata_dir = NULL;
 
-  fputs(SCORE_COOKIE,file);		/* Formatkennung */
-  for(i=0;i<leveldir[leveldir_nr].levels;i++)
+  if (!userdata_dir)
   {
-    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);
-    }
+    char *home_dir = getHomeDir();
+    char *data_dir = USERDATA_DIRECTORY;
+
+    userdata_dir = getPath2(home_dir, data_dir);
   }
-  fclose(file);
 
-  chmod(filename, SCORE_PERMS);
-  return(TRUE);
+  return userdata_dir;
 }
 
-boolean CreateNewNamesFile(int mode)
+static char *getSetupDir()
 {
-  char filename[MAX_FILENAME_LEN];
-  FILE *file;
+  return getUserDataDir();
+}
 
-  if (mode==PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-	    level_directory,leveldir[leveldir_nr].filename,NAMES_FILENAME);
+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
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
+    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 (!(file=fopen(filename,"w")))
-    return(FALSE);
+  if (tape_dir)
+    free(tape_dir);
 
-  fputs(NAMES_COOKIE,file);		/* Formatkennung */
-  fclose(file);
+  if (strlen(level_subdir) > 0)
+    tape_dir = getPath3(data_dir, tape_subdir, level_subdir);
+  else
+    tape_dir = getPath2(data_dir, tape_subdir);
 
-  chmod(filename, NAMES_PERMS);
-  return(TRUE);
+  return tape_dir;
 }
 
-boolean LoadLevelInfo()
+static char *getScoreDir(char *level_subdir)
 {
-  int i;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
-  FILE *file;
+  static char *score_dir = NULL;
+  char *data_dir = getGlobalDataDir();
+  char *score_subdir = SCORES_DIRECTORY;
 
-  sprintf(filename,"%s/%s",level_directory,LEVDIR_FILENAME);
+  if (score_dir)
+    free(score_dir);
 
-  if (!(file=fopen(filename,"r")))
-  {
-    Error(ERR_RETURN, "cannot read level info '%s'", filename);
-    return(FALSE);
-  }
+  if (strlen(level_subdir) > 0)
+    score_dir = getPath3(data_dir, score_subdir, level_subdir);
+  else
+    score_dir = getPath2(data_dir, score_subdir);
 
-  fscanf(file,"%s\n",cookie);
-  if (strcmp(cookie,LEVELDIR_COOKIE))	/* ungültiges Format? */
-  {
-    Error(ERR_RETURN, "wrong format of level info file");
-    fclose(file);
-    return(FALSE);
-  }
+  return score_dir;
+}
 
-  num_leveldirs = 0;
-  leveldir_nr = 0;
-  for(i=0;i<MAX_LEVDIR_ENTRIES;i++)
-  {
-    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;
+static char *getLevelFilename(int nr)
+{
+  static char *filename = NULL;
+  char basename[MAX_FILENAME_LEN];
 
-    num_leveldirs++;
-  }
+  if (filename != NULL)
+    free(filename);
 
-  if (!num_leveldirs)
-  {
-    Error(ERR_RETURN, "empty level info '%s'", filename);
-    return(FALSE);
-  }
+  sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION);
+  filename = getPath3((leveldir[leveldir_nr].user_defined ?
+		       getUserLevelDir("") :
+		       options.level_directory),
+		      leveldir[leveldir_nr].filename,
+		      basename);
 
-  return(TRUE);
+  return filename;
 }
 
-void LoadLevel(int level_nr)
+static char *getTapeFilename(int nr)
 {
-  int i,x,y;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
-  FILE *file;
+  static char *filename = NULL;
+  char basename[MAX_FILENAME_LEN];
 
-  sprintf(filename,"%s/%s/%d",
-	  level_directory,leveldir[leveldir_nr].filename,level_nr);
+  if (filename != NULL)
+    free(filename);
 
-  if (!(file = fopen(filename,"r")))
-    Error(ERR_RETURN, "cannot read level '%s' - creating new level", filename);
-  else
-  {
-    fgets(cookie,LEVEL_COOKIE_LEN,file);
-    fgetc(file);
+  sprintf(basename, "%03d.%s", nr, TAPEFILE_EXTENSION);
+  filename = getPath2(getTapeDir(leveldir[leveldir_nr].filename), basename);
 
-    if (strcmp(cookie,LEVEL_COOKIE))	/* ungültiges Format? */
-    {
-      Error(ERR_RETURN, "wrong format of level file '%s'", filename);
-      fclose(file);
-      file = NULL;
-    }
-  }
+  return filename;
+}
 
-  if (file)
-  {
-    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);
+static char *getScoreFilename(int nr)
+{
+  static char *filename = NULL;
+  char basename[MAX_FILENAME_LEN];
 
-    for(i=0;i<NUM_FREE_LVHD_BYTES;i++)	/* Rest frei / Headergröße 80 Bytes */
-      fgetc(file);
+  if (filename != NULL)
+    free(filename);
 
-    for(y=0;y<MAX_LEV_FIELDY;y++) 
-      for(x=0;x<MAX_LEV_FIELDX;x++) 
-	Feld[x][y] = Ur[x][y] = EL_ERDREICH;
+  sprintf(basename, "%03d.%s", nr, SCOREFILE_EXTENSION);
+  filename = getPath2(getScoreDir(leveldir[leveldir_nr].filename), basename);
 
-    for(y=0;y<lev_fieldy;y++) 
-      for(x=0;x<lev_fieldx;x++) 
-	Feld[x][y] = Ur[x][y] = fgetc(file);
+  return filename;
+}
 
-    fclose(file);
+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);
+}
 
-    if (level.time<=10)	/* Mindestspieldauer */
-      level.time = 10;
-  }
-  else
-  {
-    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;
-  }
+static void InitUserDataDirectory()
+{
+  createDirectory(getUserDataDir(), "user data");
 }
 
-void LoadLevelTape(int level_nr)
+static void InitTapeDirectory(char *level_subdir)
 {
-  int i;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
-  FILE *file;
-  boolean levelrec_10 = FALSE;
+  createDirectory(getUserDataDir(), "user data");
+  createDirectory(getTapeDir(""), "main tape");
+  createDirectory(getTapeDir(level_subdir), "level tape");
+}
 
-#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
+static void InitScoreDirectory(char *level_subdir)
+{
+  createDirectory(getScoreDir(""), "main score");
+  createDirectory(getScoreDir(level_subdir), "level score");
+}
 
-  if ((file=fopen(filename,"r")))
+static void InitUserLevelDirectory(char *level_subdir)
+{
+  if (access(getUserLevelDir(level_subdir), F_OK) != 0)
   {
-    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_RETURN, "wrong format of level recording file '%s'", filename);
-      fclose(file);
-      file = NULL;
-    }
-  }
+    createDirectory(getUserDataDir(), "user data");
+    createDirectory(getUserLevelDir(""), "main user level");
+    createDirectory(getUserLevelDir(level_subdir), "user level");
 
-  if (!file)
-    return;
-
-  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);
+    SaveUserLevelInfo();
+  }
+}
 
-  tape.level_nr = level_nr;
-  tape.counter = 0;
-  tape.changed = FALSE;
+static void setLevelInfoToDefaults()
+{
+  int i, x, y;
 
-  tape.recording = FALSE;
-  tape.playing = FALSE;
-  tape.pausing = FALSE;
+  lev_fieldx = level.fieldx = STD_LEV_FIELDX;
+  lev_fieldy = level.fieldy = STD_LEV_FIELDY;
 
-  for(i=0;i<tape.length;i++)
-  {
-    int j;
+  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 (i >= MAX_TAPELEN)
-      break;
+  level.time = 100;
+  level.edelsteine = 0;
+  level.tempo_amoebe = 10;
+  level.dauer_sieb = 10;
+  level.dauer_ablenk = 10;
+  level.amoebe_inhalt = EL_DIAMANT;
 
-    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);
-    }
+  level.high_speed = FALSE;
 
-    tape.pos[i].delay = fgetc(file);
+  strcpy(level.name, "Nameless Level");
 
-    if (feof(file))
-      break;
-  }
+  for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
+    level.score[i] = 10;
 
-  fclose(file);
+  MampferMax = 4;
+  for(i=0; i<8; i++)
+    for(x=0; x<3; x++)
+      for(y=0; y<3; y++)
+	level.mampfer_inhalt[i][x][y] = EL_FELSBROCKEN;
 
-  if (i != tape.length)
-    Error(ERR_RETURN, "level recording file '%s' corrupted", filename);
+  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;
 
-  tape.length_seconds = GetTapeLength();
+  BorderElement = EL_BETON;
 }
 
-void LoadScore(int level_nr)
+void LoadLevel(int level_nr)
 {
-  int i,j;
-  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];
+  int file_version = FILE_VERSION_1_2;	/* last version of level files */
+  int chunk_length;
   FILE *file;
 
-  sprintf(filename,"%s/%s/%s",
-	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+  /* always start with reliable default values */
+  setLevelInfoToDefaults();
 
-  if (!(file = fopen(filename,"r")))
+  if (!(file = fopen(filename, "r")))
   {
-    if (!CreateNewScoreFile())
-      Error(ERR_RETURN, "cannot create score file '%s'", filename);
-    else if (!(file = fopen(filename,"r"))) 
-      Error(ERR_RETURN, "cannot read score for level %d", level_nr);
+    Error(ERR_WARN, "cannot read level '%s' - creating new level", filename);
+    return;
   }
 
-  if (file)
-  {
-    fgets(cookie,SCORE_COOKIE_LEN,file);
-    if (strcmp(cookie,SCORE_COOKIE))	/* ungültiges Format? */
-    {
-      Error(ERR_RETURN, "wrong format of score file '%s'", filename);
-      fclose(file);
-      file = NULL;
-    }
-  }
+  /* 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)
+  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 */
   {
-    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);
-    }
+    Error(ERR_WARN, "wrong file identifier of level file '%s'", filename);
     fclose(file);
+    return;
   }
-  else
+
+  /* read chunk "HEAD" */
+  if (file_version >= FILE_VERSION_1_2)
   {
-    for(i=0;i<MAX_SCORE_ENTRIES;i++)
+    /* first check header chunk identifier and chunk length */
+    fgets(chunk, CHUNK_ID_LEN + 1, file);
+    chunk_length =
+      (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
+    if (strcmp(chunk, "HEAD") || chunk_length != LEVEL_HEADER_SIZE)
     {
-      strcpy(highscore[i].Name,EMPTY_ALIAS);
-      highscore[i].Score = 0;
+      Error(ERR_WARN, "wrong 'HEAD' chunk of level file '%s'", filename);
+      fclose(file);
+      return;
     }
   }
-}
-
-void LoadPlayerInfo(int mode)
-{
-  int i;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
-  FILE *file;
-  char *login_name = GetLoginName();
-  struct PlayerInfo default_player, new_player;
-  int version_10_file = FALSE;
 
-  if (mode==PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-	    level_directory,leveldir[leveldir_nr].filename,NAMES_FILENAME);
-  else
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
+  lev_fieldx = level.fieldx = fgetc(file);
+  lev_fieldy = level.fieldy = fgetc(file);
 
-  for(i=0;i<MAX_NAMELEN;i++)
-    default_player.login_name[i] = default_player.alias_name[i] = 0;
-  strncpy(default_player.login_name,login_name,MAX_NAMELEN-1);
-  strncpy(default_player.alias_name,login_name,MAX_NAMELEN-1);
-  default_player.handicap = 0;
-  default_player.setup = DEFAULT_SETUP;
-  default_player.leveldir_nr = 0;
-  default_player.level_nr = 0;
+  level.time		= (fgetc(file)<<8) | fgetc(file);
+  level.edelsteine	= (fgetc(file)<<8) | fgetc(file);
 
-  new_player = default_player;
+  for(i=0; i<MAX_LEVNAMLEN; i++)
+    level.name[i]	= fgetc(file);
+  level.name[MAX_LEVNAMLEN - 1] = 0;
 
-  if (!(file = fopen(filename,"r")))
-  {
-    if (!CreateNewNamesFile(mode))
-      Error(ERR_RETURN, "cannot create names file '%s'", filename);
-    else if (!(file = fopen(filename,"r"))) 
-      Error(ERR_RETURN, "cannot read player information file '%s'", filename);
-  }
+  for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
+    level.score[i]	= fgetc(file);
 
-  if (file)
+  MampferMax = 4;
+  for(i=0; i<8; i++)
   {
-    fgets(cookie,NAMES_COOKIE_LEN,file);
-    if (!strcmp(cookie,NAMES_COOKIE_10))	/* altes Format? */
-      version_10_file = TRUE;
-    else if (strcmp(cookie,NAMES_COOKIE))	/* ungültiges Format? */
+    for(y=0; y<3; y++)
     {
-      Error(ERR_RETURN, "wrong format of names file '%s'", filename);
-      fclose(file);
-      file = NULL;
+      for(x=0; x<3; x++)
+      {
+	if (i < 4)
+	  level.mampfer_inhalt[i][x][y] = fgetc(file);
+	else
+	  level.mampfer_inhalt[i][x][y] = EL_LEERRAUM;
+      }
     }
   }
 
-  if (!file)
-  {
-    *local_player = default_player;
-    level_nr = default_player.level_nr;
-    return;
-  }
+  level.tempo_amoebe	= fgetc(file);
+  level.dauer_sieb	= fgetc(file);
+  level.dauer_ablenk	= fgetc(file);
+  level.amoebe_inhalt = fgetc(file);
 
-  while(1)
+  for(i=0; i<LEVEL_HEADER_UNUSED; i++)	/* skip unused header bytes */
+    fgetc(file);
+
+  /* read chunk "BODY" */
+  if (file_version >= FILE_VERSION_1_2)
   {
-    for(i=0;i<MAX_NAMELEN;i++)
-      new_player.login_name[i] = fgetc(file);
-    for(i=0;i<MAX_NAMELEN;i++)
-      new_player.alias_name[i] = fgetc(file);
-    new_player.handicap = fgetc(file);
-    new_player.setup = (fgetc(file)<<8) | fgetc(file);
-    new_player.leveldir_nr = fgetc(file);
-    if (!version_10_file)
+    fgets(chunk, CHUNK_ID_LEN + 1, file);
+    chunk_length =
+      (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
+
+    /* look for optional content chunk */
+    if (strcmp(chunk, "CONT") == 0 && chunk_length == 4 + 8 * 3 * 3)
     {
-      new_player.level_nr = fgetc(file);
-      for(i=0;i<10;i++)		/* currently unused bytes */
-	fgetc(file);
+      fgetc(file);
+      MampferMax = fgetc(file);
+      fgetc(file);
+      fgetc(file);
+
+      for(i=0; i<8; i++)
+	for(y=0; y<3; y++)
+	  for(x=0; x<3; x++)
+	    level.mampfer_inhalt[i][x][y] = fgetc(file);
+
+      fgets(chunk, CHUNK_ID_LEN + 1, file);
+      chunk_length =
+	(fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
     }
-    else
-      new_player.level_nr = new_player.handicap;
 
-    if (feof(file))		/* Spieler noch nicht in Liste enthalten */
+    /* next check body chunk identifier and chunk length */
+    if (strcmp(chunk, "BODY") || chunk_length != lev_fieldx * lev_fieldy)
     {
-      new_player = default_player;
-
+      Error(ERR_WARN, "wrong 'BODY' chunk of level file '%s'", filename);
       fclose(file);
-      if (!(file = fopen(filename,"a")))
-	Error(ERR_RETURN, "cannot append new player to names file '%s'",
-	      filename);
-      else
-      {
-	for(i=0;i<MAX_NAMELEN;i++)
-	  fputc(new_player.login_name[i],file);
-	for(i=0;i<MAX_NAMELEN;i++)
-	  fputc(new_player.alias_name[i],file);
-	fputc(new_player.handicap,file);
-	fputc(new_player.setup / 256,file);
-	fputc(new_player.setup % 256,file);
-	fputc(new_player.leveldir_nr,file);
-	if (!version_10_file)
-	{
-	  fputc(new_player.level_nr,file);
-	  for(i=0;i<10;i++)	/* currently unused bytes */
-	    fputc(0,file);
-	}
-      }
-      break;
+      return;
     }
-    else			/* prüfen, ob Spieler in Liste enthalten */
-      if (!strncmp(new_player.login_name,login_name,MAX_NAMELEN-1))
-	break;
   }
 
-  if (mode==PLAYER_SETUP)
-  {
-    *local_player = new_player;
-    if (local_player->leveldir_nr < num_leveldirs)
-      leveldir_nr = local_player->leveldir_nr;
-    else
-      leveldir_nr = 0;
-  }
-  else
-  {
-    local_player->handicap = new_player.handicap;
-    local_player->level_nr = new_player.level_nr;
-  }
+  for(y=0; y<lev_fieldy; y++)
+    for(x=0; x<lev_fieldx; x++)
+      Feld[x][y] = Ur[x][y] = fgetc(file);
+
+  fclose(file);
 
-  level_nr = local_player->level_nr;
+#if 0
+  if (level.time <= 10)		/* minimum playing time of each level */
+    level.time = 10;
+#endif
 
-  if (file)
-    fclose(file);
+  if (file_version == FILE_VERSION_1_0 &&
+      leveldir[leveldir_nr].sort_priority >= LEVELCLASS_CONTRIBUTION_START &&
+      leveldir[leveldir_nr].sort_priority <= LEVELCLASS_CONTRIBUTION_END)
+  {
+    Error(ERR_WARN, "level file '%s' has version number 1.0", filename);
+    Error(ERR_WARN, "using high speed movement for player");
+    level.high_speed = TRUE;
+  }
 }
 
 void SaveLevel(int level_nr)
 {
-  int i,x,y;
-  char filename[MAX_FILENAME_LEN];
+  int i, x, y;
+  char *filename = getLevelFilename(level_nr);
   FILE *file;
+  int chunk_length;
 
-  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_RETURN, "cannot save level file '%s'", filename);
+    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);
+  fputs(LEVEL_COOKIE, file);		/* file identifier */
+  fputc('\n', file);
 
-  fclose(file);
+  fputs("HEAD", file);			/* chunk identifier for file header */
 
-  chmod(filename, LEVEL_PERMS);
-}
+  chunk_length = LEVEL_HEADER_SIZE;
 
-void SaveLevelTape(int level_nr)
-{
-  int i;
-  char filename[MAX_FILENAME_LEN];
-  FILE *file;
-  boolean new_tape = TRUE;
+  fputc((chunk_length >>  24) & 0xff, file);
+  fputc((chunk_length >>  16) & 0xff, file);
+  fputc((chunk_length >>   8) & 0xff, file);
+  fputc((chunk_length >>   0) & 0xff, file);
 
-#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
+  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);
 
-  /* Testen, ob bereits eine Aufnahme existiert */
-  if ((file=fopen(filename,"r")))
-  {
-    new_tape = FALSE;
-    fclose(file);
+  for(i=0; i<MAX_LEVNAMLEN; i++)
+    fputc(level.name[i], file);
+  for(i=0; i<LEVEL_SCORE_ELEMENTS; 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);
 
-    if (!Request("Replace old tape ?",REQ_ASK))
-      return;
-  }
+  for(i=0; i<LEVEL_HEADER_UNUSED; i++)	/* set unused header bytes to zero */
+    fputc(0, file);
 
-  if (!(file=fopen(filename,"w")))
-  {
-    Error(ERR_RETURN, "cannot save level recording file '%s'", filename);
-    return;
-  }
+  fputs("CONT", file);			/* chunk identifier for contents */
 
-  fputs(LEVELREC_COOKIE,file);		/* Formatkennung */
-  fputc(0x0a,file);
+  chunk_length = 4 + 8 * 3 * 3;
 
-  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);
+  fputc((chunk_length >>  24) & 0xff, file);
+  fputc((chunk_length >>  16) & 0xff, file);
+  fputc((chunk_length >>   8) & 0xff, file);
+  fputc((chunk_length >>   0) & 0xff, file);
 
-  fputc((tape.date >>  24) & 0xff,file);
-  fputc((tape.date >>  16) & 0xff,file);
-  fputc((tape.date >>   8) & 0xff,file);
-  fputc((tape.date >>   0) & 0xff,file);
+  fputc(EL_MAMPFER, file);
+  fputc(MampferMax, file);
+  fputc(0, file);
+  fputc(0, file);
 
-  fputc((tape.length >>  24) & 0xff,file);
-  fputc((tape.length >>  16) & 0xff,file);
-  fputc((tape.length >>   8) & 0xff,file);
-  fputc((tape.length >>   0) & 0xff,file);
+  for(i=0; i<8; i++)
+    for(y=0; y<3; y++)
+      for(x=0; x<3; x++)
+	fputc(level.mampfer_inhalt[i][x][y], file);
 
-  for(i=0;i<tape.length;i++)
-  {
-    int j;
+  fputs("BODY", file);			/* chunk identifier for file body */
+  chunk_length = lev_fieldx * lev_fieldy;
 
-    for(j=0; j<MAX_PLAYERS; j++)
-      fputc(tape.pos[i].action[j],file);
+  fputc((chunk_length >>  24) & 0xff, file);
+  fputc((chunk_length >>  16) & 0xff, file);
+  fputc((chunk_length >>   8) & 0xff, file);
+  fputc((chunk_length >>   0) & 0xff, file);
 
-    fputc(tape.pos[i].delay,file);
-  }
+  for(y=0; y<lev_fieldy; y++) 
+    for(x=0; x<lev_fieldx; x++) 
+      fputc(Ur[x][y], file);
 
   fclose(file);
 
-  chmod(filename, LEVREC_PERMS);
-
-  tape.changed = FALSE;
-
-  if (new_tape)
-    Request("tape saved !",REQ_CONFIRM);
+  chmod(filename, LEVEL_PERMS);
 }
 
-void SaveScore(int level_nr)
+void LoadTape(int level_nr)
 {
-  int i,j;
-  char filename[MAX_FILENAME_LEN];
+  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;
+
+  /* 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;
 
-  sprintf(filename,"%s/%s/%s",
-	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+  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 */
   {
-    Error(ERR_RETURN, "cannot save score for level %d", level_nr);
+    Error(ERR_WARN, "wrong file identifier of tape file '%s'", filename);
+    fclose(file);
     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++)
+  /* read chunk "HEAD" */
+  if (file_version >= FILE_VERSION_1_2)
   {
-    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);
+    /* first check header chunk identifier and chunk length */
+    fgets(chunk, CHUNK_ID_LEN + 1, file);
+    chunk_length =
+      (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
+
+    if (strcmp(chunk, "HEAD") || chunk_length != TAPE_HEADER_SIZE)
+    {
+      Error(ERR_WARN, "wrong 'HEAD' chunk of tape file '%s'", filename);
+      fclose(file);
+      return;
+    }
   }
-  fclose(file);
-}
 
-void SavePlayerInfo(int mode)
-{
-  int i;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
-  FILE *file;
-  struct PlayerInfo default_player;
-  int version_10_file = 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);
 
+  /* 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);
 
-  if (mode == PLAYER_SETUP)
-    SaveSetup();
+    /* 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;
 
+      if (store_participating_players & (1 << i))
+      {
+	tape.player_participates[i] = TRUE;
+	num_participating_players++;
+      }
+    }
+  }
 
+  tape.level_nr = level_nr;
+  tape.counter = 0;
+  tape.changed = FALSE;
 
-  if (mode == PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-	    level_directory,leveldir[leveldir_nr].filename,NAMES_FILENAME);
-  else
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
+  tape.recording = FALSE;
+  tape.playing = FALSE;
+  tape.pausing = FALSE;
 
-  if (!(file = fopen(filename,"r+")))
+  /* read chunk "BODY" */
+  if (file_version >= FILE_VERSION_1_2)
   {
-    Error(ERR_RETURN, "cannot save player information to file '%s'", filename);
-    return;
+    /* next check body chunk identifier and chunk length */
+    fgets(chunk, CHUNK_ID_LEN + 1, file);
+    chunk_length =
+      (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
+    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;
+    }
   }
 
-  fgets(cookie,NAMES_COOKIE_LEN,file);
-  if (!strcmp(cookie,NAMES_COOKIE_10))	/* altes Format? */
-    version_10_file = TRUE;
-  else if (strcmp(cookie,NAMES_COOKIE))	/* ungültiges Format? */
+  for(i=0; i<tape.length; i++)
   {
-    Error(ERR_RETURN, "wrong format of names file '%s'", filename);
-    fclose(file);
-    return;
-  }
+    if (i >= MAX_TAPELEN)
+      break;
 
-  while(1)
-  {
-    for(i=0;i<MAX_NAMELEN;i++)
-      default_player.login_name[i] = fgetc(file);
-    for(i=0;i<MAX_NAMELEN;i++)
-      default_player.alias_name[i] = fgetc(file);
-    default_player.handicap = fgetc(file);
-    default_player.setup = (fgetc(file)<<8) | fgetc(file);
-    default_player.leveldir_nr = fgetc(file);
-    if (!version_10_file)
+    for(j=0; j<MAX_PLAYERS; j++)
     {
-      default_player.level_nr = fgetc(file);
-      for(i=0;i<10;i++)		/* currently unused bytes */
-	fgetc(file);
+      tape.pos[i].action[j] = MV_NO_MOVING;
+
+      if (tape.player_participates[j])
+	tape.pos[i].action[j] = fgetc(file);
     }
-    else
-      default_player.level_nr = default_player.handicap;
 
-    if (feof(file))		/* Spieler noch nicht in Liste enthalten */
-      break;
-    else			/* prüfen, ob Spieler in Liste enthalten */
-      if (!strncmp(default_player.login_name,
-		   local_player->login_name, MAX_NAMELEN-1))
+    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++)
       {
-	fseek(file,-(2*MAX_NAMELEN+1+2+1+(version_10_file ? 0 : 11)),SEEK_CUR);
-	break;
+	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++;
+	}
       }
-  }
 
-  local_player->level_nr = level_nr;
-
-  for(i=0;i<MAX_NAMELEN;i++)
-    fputc(local_player->login_name[i],file);
-  for(i=0;i<MAX_NAMELEN;i++)
-    fputc(local_player->alias_name[i],file);
-  fputc(local_player->handicap,file);
-  fputc(local_player->setup / 256,file);
-  fputc(local_player->setup % 256,file);
-  fputc(local_player->leveldir_nr,file);
-  if (!version_10_file)
-  {
-    fputc(local_player->level_nr,file);
-    for(i=0;i<10;i++)		/* currently unused bytes */
-      fputc(0,file);
+      if (num_moves > 1)
+      {
+	num_moves--;
+	i += num_moves;
+	tape.length += num_moves;
+      }
+    }
+
+    if (feof(file))
+      break;
   }
 
   fclose(file);
+
+  if (i != tape.length)
+    Error(ERR_WARN, "level recording file '%s' corrupted", filename);
+
+  tape.length_seconds = GetTapeLength();
 }
 
-void LoadJoystickData()
+void SaveTape(int level_nr)
 {
   int i;
-  char cookie[256];
+  char *filename = getTapeFilename(level_nr);
   FILE *file;
+  boolean new_tape = TRUE;
+  byte store_participating_players;
+  int num_participating_players;
+  int chunk_length;
 
-  if (joystick_status==JOYSTICK_OFF)
-    return;
+  InitTapeDirectory(leveldir[leveldir_nr].filename);
 
-#ifndef MSDOS
-  if (!(file=fopen(JOYDAT_FILE,"r")))
-    return;
+  /* if a tape still exists, ask to overwrite it */
+  if (access(filename, F_OK) == 0)
+  {
+    new_tape = FALSE;
+    if (!Request("Replace old tape ?", REQ_ASK))
+      return;
+  }
 
-  fscanf(file,"%s",cookie);
-  if (strcmp(cookie,JOYSTICK_COOKIE))	/* ungültiges Format? */
+  /* 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++)
   {
-    Error(ERR_RETURN, "wrong format of joystick file '%s'", JOYDAT_FILE);
-    fclose(file);
+    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;
   }
 
-  for(i=0;i<2;i++)
+  fputs(TAPE_COOKIE, file);		/* file identifier */
+  fputc('\n', file);
+
+  fputs("HEAD", file);			/* chunk identifier for file header */
+
+  chunk_length = TAPE_HEADER_SIZE;
+
+  fputc((chunk_length >>  24) & 0xff, file);
+  fputc((chunk_length >>  16) & 0xff, file);
+  fputc((chunk_length >>   8) & 0xff, file);
+  fputc((chunk_length >>   0) & 0xff, 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);
+
+  fputc((tape.date >>  24) & 0xff, file);
+  fputc((tape.date >>  16) & 0xff, file);
+  fputc((tape.date >>   8) & 0xff, file);
+  fputc((tape.date >>   0) & 0xff, file);
+
+  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_HEADER_UNUSED; i++)	/* set unused header bytes to zero */
+    fputc(0, file);
+
+  fputs("BODY", file);			/* chunk identifier for file body */
+  chunk_length = (num_participating_players + 1) * tape.length;
+
+  fputc((chunk_length >>  24) & 0xff, file);
+  fputc((chunk_length >>  16) & 0xff, file);
+  fputc((chunk_length >>   8) & 0xff, file);
+  fputc((chunk_length >>   0) & 0xff, file);
+
+  for(i=0; i<tape.length; 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);
+    int j;
+
+    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);
   }
+
   fclose(file);
 
-  CheckJoystickData();
-#else
-  load_joystick_data(JOYDAT_FILE);
-#endif
+  chmod(filename, TAPE_PERMS);
+
+  tape.changed = FALSE;
+
+  if (new_tape)
+    Request("tape saved !", REQ_CONFIRM);
 }
 
-void SaveJoystickData()
+void LoadScore(int level_nr)
 {
   int i;
+  char *filename = getScoreFilename(level_nr);
+  char cookie[MAX_LINE_LEN];
+  char line[MAX_LINE_LEN];
+  char *line_ptr;
   FILE *file;
 
-  if (joystick_status==JOYSTICK_OFF)
+  /* always start with reliable default values */
+  for(i=0; i<MAX_SCORE_ENTRIES; i++)
+  {
+    strcpy(highscore[i].Name, EMPTY_PLAYER_NAME);
+    highscore[i].Score = 0;
+  }
+
+  if (!(file = fopen(filename, "r")))
     return;
 
-#ifndef MSDOS
-  CheckJoystickData();
+  /* 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(JOYDAT_FILE,"w")))
+  if (strcmp(cookie, SCORE_COOKIE) != 0)
   {
-    Error(ERR_RETURN, "cannot save joystick calibration data to file '%s'",
-	  JOYDAT_FILE);
+    Error(ERR_WARN, "wrong file identifier of score file '%s'", filename);
+    fclose(file);
     return;
   }
 
-  fprintf(file,"%s\n",JOYSTICK_COOKIE);	/* Formatkennung */
-  for(i=0;i<2;i++)
+  for(i=0; i<MAX_SCORE_ENTRIES; 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);
+    fscanf(file, "%d", &highscore[i].Score);
+    fgets(line, MAX_LINE_LEN, file);
+
+    if (line[strlen(line)-1] == '\n')
+      line[strlen(line)-1] = '\0';
+
+    for (line_ptr = line; *line_ptr; line_ptr++)
+    {
+      if (*line_ptr != ' ' && *line_ptr != '\t' && *line_ptr != '\0')
+      {
+	strncpy(highscore[i].Name, line_ptr, MAX_NAMELEN - 1);
+	highscore[i].Name[MAX_NAMELEN - 1] = '\0';
+	break;
+      }
+    }
   }
+
   fclose(file);
+}
 
-  chmod(JOYDAT_FILE, JOYDAT_PERMS);
-#else
-  save_joystick_data(JOYDAT_FILE);
-#endif
+void SaveScore(int level_nr)
+{
+  int i;
+  char *filename = getScoreFilename(level_nr);
+  FILE *file;
 
-}
+  InitScoreDirectory(leveldir[leveldir_nr].filename);
+
+  if (!(file = fopen(filename, "w")))
+  {
+    Error(ERR_WARN, "cannot save score for level %d", level_nr);
+    return;
+  }
+
+  fprintf(file, "%s\n\n", SCORE_COOKIE);
+
+  for(i=0; i<MAX_SCORE_ENTRIES; i++)
+    fprintf(file, "%d %s\n", highscore[i].Score, highscore[i].Name);
+
+  fclose(file);
 
-/* ------------------------------------------------------------------------- */
-/* new setup functions                                                       */
-/* ------------------------------------------------------------------------- */
-
-#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
-
-#define SETUP_TOKEN_PLAYER_PREFIX	"player_"
+  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_LEVELS		30
+#define LEVELINFO_TOKEN_FIRST_LEVEL	31
+#define LEVELINFO_TOKEN_SORT_PRIORITY	32
+#define LEVELINFO_TOKEN_READONLY	33
+
+#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
 {
-  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"		},
+  { 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_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)
@@ -875,7 +1000,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)
@@ -889,78 +1014,38 @@ 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 *getSetupEntry(char *prefix, int token_nr, int token_value)
+static char *getFormattedSetupEntry(char *token, char *value)
 {
   int i;
-  static char entry[80];
+  static char entry[MAX_LINE_LEN];
 
-  sprintf(entry, "%s%s:", prefix, getSetupToken(token_nr));
-  for (i=strlen(entry); i<30; i++)
+  sprintf(entry, "%s:", token);
+  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[80];
-  char *keyname = getKeyNameFromKeySym(keysym);
-
-  sprintf(entry, "%s%s:", prefix, getSetupToken(token_nr));
-  for (i=strlen(entry); i<30; 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);
-  }
+  strcat(entry, value);
 
   return entry;
 }
 
-static void freeSetupFileInfo(struct SetupFileInfo *setup_file_info)
+static void freeSetupFileList(struct SetupFileList *setup_file_list)
 {
-  if (!setup_file_info)
+  if (!setup_file_list)
     return;
 
-  if (setup_file_info->token)
-    free(setup_file_info->token);
-  if (setup_file_info->value)
-    free(setup_file_info->value);
-  if (setup_file_info->next)
-    freeSetupFileInfo(setup_file_info->next);
-  free(setup_file_info);
+  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 SetupFileInfo *newSetupFileInfo(char *token, char *value)
+static struct SetupFileList *newSetupFileList(char *token, char *value)
 {
-  struct SetupFileInfo *new = checked_malloc(sizeof(struct SetupFileInfo));
+  struct SetupFileList *new = checked_malloc(sizeof(struct SetupFileList));
 
   new->token = checked_malloc(strlen(token) + 1);
   strcpy(new->token, token);
@@ -973,414 +1058,756 @@ static struct SetupFileInfo *newSetupFileInfo(char *token, char *value)
   return new;
 }
 
-static char *lookupSetupFileValue(struct SetupFileInfo *setup_file_info,
-				  char *token)
+static char *getTokenValue(struct SetupFileList *setup_file_list,
+			   char *token)
 {
-  if (!setup_file_info)
+  if (!setup_file_list)
     return NULL;
 
-  if (strcmp(setup_file_info->token, token) == 0)
-    return setup_file_info->value;
+  if (strcmp(setup_file_list->token, token) == 0)
+    return setup_file_list->value;
   else
-    return lookupSetupFileValue(setup_file_info->next, token);
+    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 printSetupFileInfo(struct SetupFileInfo *setup_file_info)
+static void printSetupFileList(struct SetupFileList *setup_file_list)
 {
-  if (!setup_file_info)
+  if (!setup_file_list)
     return;
 
-  printf("token: '%s'\n", setup_file_info->token);
-  printf("value: '%s'\n", setup_file_info->value);
+  printf("token: '%s'\n", setup_file_list->token);
+  printf("value: '%s'\n", setup_file_list->value);
 
-  printSetupFileInfo(setup_file_info->next);
+  printSetupFileList(setup_file_list->next);
 }
 #endif
 
-static void decodeSetupFileInfo(struct SetupFileInfo *setup_file_info)
+static struct SetupFileList *loadSetupFileList(char *filename)
 {
-  int i;
-  int token_nr = -1;
-  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_info)
-    return;
+  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;
 
-  token = setup_file_info->token;
-  token_value = setup_file_info->value;
-  token_integer_value = get_string_integer_value(token_value);
-  token_boolean_value = get_string_boolean_value(token_value);
+  FILE *file;
 
-  token_player_prefix_len = strlen(SETUP_TOKEN_PLAYER_PREFIX);
+  if (!(file = fopen(filename, "r")))
+  {
+    Error(ERR_WARN, "cannot open configuration file '%s'", filename);
+    return NULL;
+  }
 
-  if (strncmp(token, SETUP_TOKEN_PLAYER_PREFIX, token_player_prefix_len) == 0)
+  while(!feof(file))
   {
-    token += token_player_prefix_len;
+    /* read next line of input file */
+    if (!fgets(line, MAX_LINE_LEN, file))
+      break;
+
+    /* cut trailing comment or whitespace from input line */
+    for (line_ptr = line; *line_ptr; line_ptr++)
+    {
+      if (*line_ptr == '#' || *line_ptr == '\n')
+      {
+	*line_ptr = '\0';
+	break;
+      }
+    }
+
+    /* 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';
+
+    /* ignore empty lines */
+    if (*line == '\0')
+      continue;
+
+    line_len = strlen(line);
 
-    if (*token >= '0' && *token <= '9')
+    /* cut leading whitespaces from token */
+    for (token = line; *token; token++)
+      if (*token != ' ' && *token != '\t')
+	break;
+
+    /* find end of token */
+    for (line_ptr = token; *line_ptr; line_ptr++)
     {
-      player_nr = ((int)(*token - '0') - 1 + MAX_PLAYERS) % MAX_PLAYERS;
-      token++;
+      if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':')
+      {
+	*line_ptr = '\0';
+	break;
+      }
     }
+
+    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;
+
+    if (*token && *value)
+      setTokenValue(setup_file_list, token, value);
   }
 
-  for (i=0; i<NUM_SETUP_TOKENS; i++)
+  fclose(file);
+
+  first_valid_list_entry = setup_file_list->next;
+
+  /* free empty list header */
+  setup_file_list->next = NULL;
+  freeSetupFileList(setup_file_list);
+
+  if (first_valid_list_entry == NULL)
+    Error(ERR_WARN, "configuration file '%s' is empty", filename);
+
+  return first_valid_list_entry;
+}
+
+static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
+					 char *identifier)
+{
+  if (!setup_file_list)
+    return;
+
+  if (strcmp(setup_file_list->token, TOKEN_STR_FILE_IDENTIFIER) == 0)
   {
-    if (strcmp(token, setup_info[i].token) == 0)
+    if (strcmp(setup_file_list->value, identifier) != 0)
     {
-      token_nr = i;
-      break;
+      Error(ERR_WARN, "configuration file has wrong version");
+      return;
     }
+    else
+      return;
   }
 
+  if (setup_file_list->next)
+    checkSetupFileListIdentifier(setup_file_list->next, identifier);
+  else
+  {
+    Error(ERR_WARN, "configuration file has no version information");
+    return;
+  }
+}
 
+static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi)
+{
+  ldi->name = getStringCopy("non-existing");
+  ldi->levels = 0;
+  ldi->first_level = 0;
+  ldi->sort_priority = LEVELCLASS_UNDEFINED;	/* default: least priority */
+  ldi->readonly = TRUE;
+}
 
-  /*
-  printf("token == '%s', token_integer_value == %d\n",
-	 token, token_integer_value);
+static void setSetupInfoToDefaults(struct SetupInfo *si)
+{
+  int i;
 
+  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;
 
-  printf("[player %d] token == '%s', token_value == '%s' (%ld)\n",
-	 player_nr, token, token_value,
-	 (unsigned long)getKeySymFromX11KeyName(token_value));
-  */
+  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.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);
+  }
+}
 
+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;
 
-  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;
+    case TYPE_KEYSYM:
+      *(KeySym *)setup_value = getKeySymFromX11KeyName(token_value);
       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);
+
+    case TYPE_INTEGER:
+      *(int *)setup_value = get_string_integer_value(token_value);
       break;
-    case SETUP_TOKEN_KEY_BOMB:
-      setup.input[player_nr].key.bomb = getKeySymFromX11KeyName(token_value);
+
+    case TYPE_STRING:
+      if (*(char **)setup_value != NULL)
+	free(*(char **)setup_value);
+      *(char **)setup_value = getStringCopy(token_value);
       break;
+
     default:
       break;
   }
-
-  decodeSetupFileInfo(setup_file_info->next);
 }
 
-void LoadSetup()
+static void decodeSetupFileList(struct SetupFileList *setup_file_list)
 {
-  int line_len;
-  char filename[MAX_FILENAME_LEN];
-  char line[MAX_LINE_LEN];
-  char *token, *value, *line_ptr;
-  struct SetupFileInfo *setup_file_info, **next_entry = &setup_file_info;
-  FILE *file;
+  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;
 
-  printf("LoadSetup\n");
+  /* 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(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
+      sprintf(full_token, "%s%s", prefix, token_info[i].text);
+      setSetupInfo(i, getTokenValue(setup_file_list, full_token));
+    }
+    setup.input[pnr] = sii;
+  }
+}
 
-  if (!(file = fopen(filename, "r")))
-  {
-    int i;
+int getLevelSeriesNrFromLevelSeriesName(char *level_series_name)
+{
+  int i;
 
-    Error(ERR_RETURN, "cannot open setup file '%s'", filename);
+  if (!level_series_name)
+    return 0;
 
-    /* use default values for setup */
+  for (i=0; i<num_leveldirs; i++)
+    if (strcmp(level_series_name, leveldir[i].filename) == 0)
+      return i;
 
-    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;
+  return 0;
+}
 
-    for (i=0; i<MAX_PLAYERS; i++)
-    {
-      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);
-    }
+int getLastPlayedLevelOfLevelSeries(char *level_series_name)
+{
+  char *token_value;
+  int level_series_nr = getLevelSeriesNrFromLevelSeriesName(level_series_name);
+  int last_level_nr = 0;
 
-    return;
+  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);
 
-  /*
-  next_entry = &setup_file;
-  */
+    compare_result = strcmp(name1, name2);
 
+    free(name1);
+    free(name2);
+  }
 
+  return compare_result;
+}
 
-  while(!feof(file))
+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)
   {
-    /* read next line */
-    if (!fgets(line, MAX_LINE_LEN, file))
+    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;
 
-    /* cut trailing comment or whitespace from input line */
-    for (line_ptr = line; *line_ptr; line_ptr++)
+    /* 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 */
     {
-      if (*line_ptr == '#' || *line_ptr == '\n')
-      {
-	*line_ptr = '\0';
-	break;
-      }
+      free(directory);
+      continue;
     }
 
-    /* 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';
+    filename = getPath2(directory, LEVELINFO_FILENAME);
+    setup_file_list = loadSetupFileList(filename);
 
-    /* ignore empty lines */
-    if (*line == '\0')
-      continue;
+    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);
+
+      freeSetupFileList(setup_file_list);
+      current_entry++;
+    }
+    else
+      Error(ERR_WARN, "ignoring level directory '%s'", directory);
 
-    line_len = strlen(line);
+    free(directory);
+    free(filename);
+  }
 
+  if (current_entry == MAX_LEVDIR_ENTRIES)
+    Error(ERR_WARN, "using %d level directories -- ignoring the rest",
+	  current_entry);
 
-    /*
-    printf("line: '%s'\n", line);
-    */
+  closedir(dir);
 
+  if (current_entry == start_entry)
+    Error(ERR_WARN, "cannot find any valid level series in directory '%s'",
+	  level_directory);
 
-    /* cut leading whitespaces from token */
-    for (token = line; *token; token++)
-      if (*token != ' ' && *token != '\t')
-	break;
+  return current_entry;
+}
 
-    /* find end of token */
-    for (line_ptr = token; *line_ptr; line_ptr++)
-    {
-      if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':')
-      {
-	*line_ptr = '\0';
-	break;
-      }
-    }
+void LoadLevelInfo()
+{
+  InitUserLevelDirectory(getLoginName());
 
-    if (line_ptr < line + line_len)
-      value = line_ptr + 1;
-    else
-      value = "\0";
+  num_leveldirs = 0;
+  leveldir_nr = 0;
 
-    /* cut leading whitespaces from value */
-    for (; *value; value++)
-      if (*value != ' ' && *value != '\t')
-	break;
+  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");
 
-    /*
-    printf("token / value: '%s' / '%s'\n", token, value);
-    */
+  if (num_leveldirs > 1)
+    qsort(leveldir, num_leveldirs, sizeof(struct LevelDirInfo),
+	  compareLevelDirInfoEntries);
+}
 
+static void SaveUserLevelInfo()
+{
+  char *filename;
+  FILE *file;
+  int i;
 
-    if (*token && *value)
-    {
-      /* allocate new token/value pair */
+  filename = getPath2(getUserLevelDir(getLoginName()), LEVELINFO_FILENAME);
 
-      *next_entry = newSetupFileInfo(token, value);
-      next_entry = &((*next_entry)->next);
-    }
+  if (!(file = fopen(filename, "w")))
+  {
+    Error(ERR_WARN, "cannot write level info file '%s'", filename);
+    free(filename);
+    return;
   }
 
+  ldi.name = getLoginName();
+  ldi.levels = 100;
+  ldi.first_level = 0;
+  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);
 
-#if 0
-  printf("Content of setup file info:\n");
+  chmod(filename, SETUP_PERMS);
+}
 
-  printSetupFileInfo(setup_file_info);
-#endif
+void LoadSetup()
+{
+  char *filename;
+  struct SetupFileList *setup_file_list = NULL;
 
+  /* always start with reliable default values */
+  setSetupInfoToDefaults(&setup);
 
+  filename = getPath2(getSetupDir(), SETUP_FILENAME);
 
-  printf("decodeSetupFileInfo\n");
+  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_NAMELEN)
+      setup.player_name[MAX_NAMELEN - 1] = '\0';
+    else if (strlen(setup.player_name) < MAX_NAMELEN - 1)
+    {
+      char *new_name = checked_malloc(MAX_NAMELEN);
+
+      strcpy(new_name, setup.player_name);
+      free(setup.player_name);
+      setup.player_name = new_name;
+    }
+  }
+  else
+    Error(ERR_WARN, "using default setup values");
 
-  decodeSetupFileInfo(setup_file_info);
-  freeSetupFileInfo(setup_file_info);
+  free(filename);
 }
 
-void SaveSetup()
+static char *getSetupLine(char *prefix, int token_nr)
 {
   int i;
-  char filename[MAX_FILENAME_LEN];
-  FILE *file;
+  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);
 
-  printf("SaveSetup\n");
+	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;
+  FILE *file;
 
+  InitUserDataDirectory();
 
-  sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
+  filename = getPath2(getSetupDir(), SETUP_FILENAME);
 
   if (!(file = fopen(filename, "w")))
   {
-    Error(ERR_RETURN, "cannot write setup file '%s'", filename);
+    Error(ERR_WARN, "cannot write setup file '%s'", filename);
+    free(filename);
     return;
   }
 
-  fprintf(file, "file_identifier:              %s\n",
-	  SETUP_COOKIE);
-
+  fprintf(file, "%s\n",
+	  getFormattedSetupEntry(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));
+  /* 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", SETUP_TOKEN_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 LoadLevelSetup()
+{
+  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);
+
+    checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
+  }
+  else
+  {
+    level_setup_list = newSetupFileList(TOKEN_STR_FILE_IDENTIFIER,
+					LEVELSETUP_COOKIE);
+    Error(ERR_WARN, "using default setup values");
+  }
+
+  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);
+    return;
+  }
+
+  fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
+						 LEVELSETUP_COOKIE));
+  while (list_entry)
+  {
+    if (strcmp(list_entry->token, TOKEN_STR_FILE_IDENTIFIER) != 0)
+      fprintf(file, "%s\n",
+	      getFormattedSetupEntry(list_entry->token, list_entry->value));
+
+    /* just to make things nicer :) */
+    if (strcmp(list_entry->token, TOKEN_STR_LAST_LEVEL_SERIES) == 0)
+      fprintf(file, "\n");
+
+    list_entry = list_entry->next;
+  }
+
+  fclose(file);
+  free(filename);
+
+  chmod(filename, SETUP_PERMS);
+}
+
+#ifdef MSDOS
+static boolean initErrorFile()
+{
+  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);
+
+  return TRUE;
+}
+
+FILE *openErrorFile()
+{
+  static boolean first_access = TRUE;
+  char *filename;
+  FILE *error_file;
+
+  if (first_access)
+  {
+    if (!initErrorFile())
+      return NULL;
+
+    first_access = FALSE;
+  }
+
+  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