X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=21ed3ca17f8614be3770784740da65e1be5baf7c;hb=2357c391b4a587709627cc30316734b3c83c8134;hp=1efc0a1acbf1f4a91d006136d209e489803b7f54;hpb=046d80f9a1b3fad9d4d3d3aa92dcb3689849aebf;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 1efc0a1a..21ed3ca1 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,95 +1,43 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  files.h                                                 *
 ***********************************************************/
 
+#include <ctype.h>
+
 #include "files.h"
 #include "tools.h"
 #include "misc.h"
+#include "tape.h"
+#include "joystick.h"
 
-BOOL CreateNewScoreFile()
-{
-  int i,j,k;
-  char filename[MAX_FILENAME];
-  char empty_alias[MAX_NAMELEN];
-  FILE *file;
-
-  sprintf(filename,"%s/%s/%s",
-	  SCORE_PATH,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_SIZE(leveldir[leveldir_nr]);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);
-    }
-  }
-  fclose(file);
-
-  chmod(filename, SCORE_PERMS);
-  return(TRUE);
-}
-
-BOOL CreateNewNamesFile(int mode)
-{
-  char filename[MAX_FILENAME];
-  FILE *file;
-
-  if (mode==PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-	    NAMES_PATH,leveldir[leveldir_nr].filename,NAMES_FILENAME);
-  else
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
-
-  if (!(file=fopen(filename,"w")))
-    return(FALSE);
-
-  fputs(NAMES_COOKIE,file);		/* Formatkennung */
-  fclose(file);
-
-  chmod(filename, NAMES_PERMS);
-  return(TRUE);
-}
-
-BOOL LoadLevelInfo()
+boolean LoadLevelInfo()
 {
   int i;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
+  char cookie[MAX_FILENAME_LEN];
   FILE *file;
 
-  sprintf(filename,"%s/%s",LEVEL_PATH,LEVDIR_FILENAME);
+  sprintf(filename,"%s/%s",level_directory,LEVDIR_FILENAME);
 
   if (!(file=fopen(filename,"r")))
   {
-    fprintf(stderr,"%s: cannot load level info '%s'!\n",progname,filename);
+    Error(ERR_WARN, "cannot read level info '%s'", filename);
     return(FALSE);
   }
 
   fscanf(file,"%s\n",cookie);
   if (strcmp(cookie,LEVELDIR_COOKIE))	/* ungültiges Format? */
   {
-    fprintf(stderr,"%s: wrong format of level info file!\n",progname);
+    Error(ERR_WARN, "wrong format of level info file");
     fclose(file);
     return(FALSE);
   }
@@ -100,8 +48,8 @@ BOOL LoadLevelInfo()
   {
     fscanf(file,"%s",leveldir[i].filename);
     fscanf(file,"%s",leveldir[i].name);
-    fscanf(file,"%d",&leveldir[i].num_ready);
-    fscanf(file,"%d",&leveldir[i].num_free);
+    fscanf(file,"%d",&leveldir[i].levels);
+    fscanf(file,"%d",&leveldir[i].readonly);
     if (feof(file))
       break;
 
@@ -110,7 +58,7 @@ BOOL LoadLevelInfo()
 
   if (!num_leveldirs)
   {
-    fprintf(stderr,"%s: empty level info '%s'!\n",progname,filename);
+    Error(ERR_WARN, "empty level info '%s'", filename);
     return(FALSE);
   }
 
@@ -120,27 +68,23 @@ BOOL LoadLevelInfo()
 void LoadLevel(int level_nr)
 {
   int i,x,y;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
+  char cookie[MAX_FILENAME_LEN];
   FILE *file;
 
   sprintf(filename,"%s/%s/%d",
-	  LEVEL_PATH,leveldir[leveldir_nr].filename,level_nr);
+	  level_directory,leveldir[leveldir_nr].filename,level_nr);
 
-  if (!(file=fopen(filename,"r")))
-  {
-/*
-    fprintf(stderr,"%s: cannot load level '%s'!\n",progname,filename);
-*/
-  }
+  if (!(file = fopen(filename,"r")))
+    Error(ERR_WARN, "cannot read level '%s' - creating new level", filename);
   else
   {
     fgets(cookie,LEVEL_COOKIE_LEN,file);
     fgetc(file);
+
     if (strcmp(cookie,LEVEL_COOKIE))	/* ungültiges Format? */
     {
-      fprintf(stderr,"%s: wrong format of level file '%s'!\n",
-	      progname,filename);
+      Error(ERR_WARN, "wrong format of level file '%s'", filename);
       fclose(file);
       file = NULL;
     }
@@ -211,24 +155,81 @@ void LoadLevel(int level_nr)
   }
 }
 
+void SaveLevel(int level_nr)
+{
+  int i,x,y;
+  char filename[MAX_FILENAME_LEN];
+  FILE *file;
+
+  sprintf(filename,"%s/%s/%d",
+	  level_directory,leveldir[leveldir_nr].filename,level_nr);
+
+  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);
+
+  fclose(file);
+
+  chmod(filename, LEVEL_PERMS);
+}
+
 void LoadLevelTape(int level_nr)
 {
   int i;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
+  char cookie[MAX_FILENAME_LEN];
   FILE *file;
+  boolean levelrec_10 = FALSE;
 
+#ifndef MSDOS
   sprintf(filename,"%s/%s/%d.tape",
-	  LEVEL_PATH,leveldir[leveldir_nr].filename,level_nr);
+	  level_directory,leveldir[leveldir_nr].filename,level_nr);
+#else
+  sprintf(filename,"%s/%s/%d.tap",
+	  level_directory,leveldir[leveldir_nr].filename,level_nr);
+#endif
 
   if ((file=fopen(filename,"r")))
   {
     fgets(cookie,LEVELREC_COOKIE_LEN,file);
     fgetc(file);
-    if (strcmp(cookie,LEVELREC_COOKIE))	/* ungültiges Format? */
+    if (!strcmp(cookie,LEVELREC_COOKIE_10))	/* old 1.0 tape format */
+      levelrec_10 = TRUE;
+    else if (strcmp(cookie,LEVELREC_COOKIE))	/* unknown tape format */
     {
-      fprintf(stderr,"%s: wrong format of level recording file '%s'!\n",
-	      progname,filename);
+      Error(ERR_WARN, "wrong format of level recording file '%s'", filename);
       fclose(file);
       file = NULL;
     }
@@ -246,51 +247,162 @@ void LoadLevelTape(int level_nr)
 
   tape.level_nr = level_nr;
   tape.counter = 0;
+  tape.changed = FALSE;
+
   tape.recording = FALSE;
   tape.playing = FALSE;
   tape.pausing = FALSE;
 
   for(i=0;i<tape.length;i++)
   {
-    if (i>=MAX_TAPELEN)
+    int j;
+
+    if (i >= MAX_TAPELEN)
       break;
-    tape.pos[i].joystickdata = fgetc(file);
-    tape.pos[i].delay        = fgetc(file);
+
+    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].delay = fgetc(file);
+
     if (feof(file))
       break;
   }
 
+  fclose(file);
+
   if (i != tape.length)
-    fprintf(stderr,"%s: level recording file '%s' corrupted!\n",
-	    progname,filename);
+    Error(ERR_WARN, "level recording file '%s' corrupted", filename);
+
+  tape.length_seconds = GetTapeLength();
+}
+
+void SaveLevelTape(int level_nr)
+{
+  int i;
+  char filename[MAX_FILENAME_LEN];
+  FILE *file;
+  boolean new_tape = TRUE;
+
+#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
+
+  /* Testen, ob bereits eine Aufnahme existiert */
+  if ((file=fopen(filename,"r")))
+  {
+    new_tape = FALSE;
+    fclose(file);
+
+    if (!Request("Replace old tape ?",REQ_ASK))
+      return;
+  }
+
+  if (!(file=fopen(filename,"w")))
+  {
+    Error(ERR_WARN, "cannot save level recording file '%s'", filename);
+    return;
+  }
+
+  fputs(LEVELREC_COOKIE,file);		/* Formatkennung */
+  fputc(0x0a,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);
+
+  for(i=0;i<tape.length;i++)
+  {
+    int j;
+
+    for(j=0; j<MAX_PLAYERS; j++)
+      fputc(tape.pos[i].action[j],file);
+
+    fputc(tape.pos[i].delay,file);
+  }
+
+  fclose(file);
+
+  chmod(filename, LEVREC_PERMS);
+
+  tape.changed = FALSE;
+
+  if (new_tape)
+    Request("tape saved !",REQ_CONFIRM);
+}
+
+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);
+
+  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++)
+  {
+    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);
+    }
+  }
   fclose(file);
 
-  master_tape = tape;
+  chmod(filename, SCORE_PERMS);
+  return(TRUE);
 }
 
 void LoadScore(int level_nr)
 {
   int i,j;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
+  char filename[MAX_FILENAME_LEN];
+  char cookie[MAX_FILENAME_LEN];
   FILE *file;
 
   sprintf(filename,"%s/%s/%s",
-	  SCORE_PATH,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
 
-  if (!(file=fopen(filename,"r")))
+  if (!(file = fopen(filename,"r")))
   {
     if (!CreateNewScoreFile())
-    {
-      fprintf(stderr,"%s: cannot create score file '%s'!\n",
-	      progname,filename);
-    }
-    else if (!(file=fopen(filename,"r"))) 
-    {
-      fprintf(stderr,"%s: cannot load score for level %d!\n",
-	      progname,level_nr);
-    }
+      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);
   }
 
   if (file)
@@ -298,7 +410,7 @@ void LoadScore(int level_nr)
     fgets(cookie,SCORE_COOKIE_LEN,file);
     if (strcmp(cookie,SCORE_COOKIE))	/* ungültiges Format? */
     {
-      fprintf(stderr,"%s: wrong format of score file!\n",progname);
+      Error(ERR_WARN, "wrong format of score file '%s'", filename);
       fclose(file);
       file = NULL;
     }
@@ -327,378 +439,1136 @@ void LoadScore(int level_nr)
   }
 }
 
-void LoadPlayerInfo(int mode)
+void SaveScore(int level_nr)
 {
-  int i;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
+  int i,j;
+  char filename[MAX_FILENAME_LEN];
   FILE *file;
-  char *login_name = GetLoginName();
-  struct PlayerInfo default_player, new_player;
-
-  if (mode==PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-	    NAMES_PATH,leveldir[leveldir_nr].filename,NAMES_FILENAME);
-  else
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
-
-  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;
-
-  new_player = default_player;
-
-  if (!(file=fopen(filename,"r")))
-  {
-    if (!CreateNewNamesFile(mode))
-    {
-      fprintf(stderr,"%s: cannot create names file '%s'!\n",
-	      progname,filename);
-    }
-    else if (!(file=fopen(filename,"r"))) 
-    {
-      fprintf(stderr,"%s: cannot load player information '%s'!\n",
-	      progname,filename);
-    }
-  }
 
-  if (file)
-  {
-    fgets(cookie,NAMES_COOKIE_LEN,file);
-    if (strcmp(cookie,NAMES_COOKIE))	/* ungültiges Format? */
-    {
-      fprintf(stderr,"%s: wrong format of names file '%s'!\n",
-	      progname,filename);
-      fclose(file);
-      file = NULL;
-    }
-  }
+  sprintf(filename,"%s/%s/%s",
+	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
 
-  if (!file)
+  if (!(file=fopen(filename,"r+")))
   {
-    player = default_player;
-    level_nr = default_player.handicap;
+    Error(ERR_WARN, "cannot save score for level %d", level_nr);
     return;
   }
 
-  while(1)
-  {
-    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 (feof(file))		/* Spieler noch nicht in Liste enthalten */
-    {
-      new_player = default_player;
-
-      fclose(file);
-      if (!(file=fopen(filename,"a")))
-      {
-	fprintf(stderr,"%s: cannot append new player to names file '%s'!\n",
-		progname,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);
-      }
-      break;
-    }
-    else			/* prüfen, ob Spieler in Liste enthalten */
-      if (!strncmp(new_player.login_name,login_name,MAX_NAMELEN-1))
-	break;
-  }
-
-  if (mode==PLAYER_SETUP)
+  fseek(file,
+	SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)),
+	SEEK_SET);
+  for(i=0;i<MAX_SCORE_ENTRIES;i++)
   {
-    player = new_player;
-    if (player.leveldir_nr < num_leveldirs)
-      leveldir_nr = player.leveldir_nr;
-    else
-      leveldir_nr = 0;
+    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);
   }
-  else
-    player.handicap = new_player.handicap;
-
-  level_nr = player.handicap;
   fclose(file);
 }
 
-void SaveLevel(int level_nr)
+
+
+#if 0
+
+void LoadJoystickData()
 {
-  int i,x,y;
-  char filename[MAX_FILENAME];
+  int i;
+  char cookie[256];
   FILE *file;
 
-  sprintf(filename,"%s/%s/%d",
-	  LEVEL_PATH,leveldir[leveldir_nr].filename,level_nr);
+  if (joystick_status==JOYSTICK_OFF)
+    return;
 
-  if (!(file=fopen(filename,"w")))
+#ifndef MSDOS
+  if (!(file=fopen(JOYDAT_FILE,"r")))
+    return;
+
+  fscanf(file,"%s",cookie);
+  if (strcmp(cookie,JOYSTICK_COOKIE))	/* ungültiges Format? */
   {
-    fprintf(stderr,"%s: cannot save level file '%s'!\n",progname,filename);
+    Error(ERR_WARN, "wrong format of joystick file '%s'", JOYDAT_FILE);
+    fclose(file);
     return;
   }
 
-  fputs(LEVEL_COOKIE,file);		/* Formatkennung */
-  fputc(0x0a,file);
+  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);
 
-  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);
+  CheckJoystickData();
+#else
+  load_joystick_data(JOYDAT_FILE);
+#endif
+}
 
-  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);
+void SaveJoystickData()
+{
+  int i;
+  FILE *file;
 
-  for(i=0;i<NUM_FREE_LVHD_BYTES;i++)	/* Rest frei / Headergröße 80 Bytes */
-    fputc(0,file);
+  if (joystick_status==JOYSTICK_OFF)
+    return;
 
-  for(y=0;y<lev_fieldy;y++) 
-    for(x=0;x<lev_fieldx;x++) 
-      fputc(Ur[x][y],file);
+#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(filename, LEVEL_PERMS);
+  chmod(JOYDAT_FILE, JOYDAT_PERMS);
+#else
+  save_joystick_data(JOYDAT_FILE);
+#endif
+
 }
 
-void SaveLevelTape(int level_nr)
+#endif
+
+
+
+/* ------------------------------------------------------------------------- */
+/* 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_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_DOUBLE_BUFFERING	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_ALIAS_NAMES		11
+
+#define SETUP_TOKEN_USE_JOYSTICK	12
+#define SETUP_TOKEN_JOY_DEVICE_NAME	13
+#define SETUP_TOKEN_JOY_XLEFT		14
+#define SETUP_TOKEN_JOY_XMIDDLE		15
+#define SETUP_TOKEN_JOY_XRIGHT		16
+#define SETUP_TOKEN_JOY_YUPPER		17
+#define SETUP_TOKEN_JOY_YMIDDLE		18
+#define SETUP_TOKEN_JOY_YLOWER		19
+#define SETUP_TOKEN_JOY_SNAP		20
+#define SETUP_TOKEN_JOY_BOMB		21
+#define SETUP_TOKEN_KEY_LEFT		22
+#define SETUP_TOKEN_KEY_RIGHT		23
+#define SETUP_TOKEN_KEY_UP		24
+#define SETUP_TOKEN_KEY_DOWN		25
+#define SETUP_TOKEN_KEY_SNAP		26
+#define SETUP_TOKEN_KEY_BOMB		27
+
+#define NUM_SETUP_TOKENS		28
+
+#define FIRST_GLOBAL_SETUP_TOKEN	SETUP_TOKEN_SOUND
+#define LAST_GLOBAL_SETUP_TOKEN		SETUP_TOKEN_ALIAS_NAMES
+
+#define FIRST_PLAYER_SETUP_TOKEN	SETUP_TOKEN_USE_JOYSTICK
+#define LAST_PLAYER_SETUP_TOKEN		SETUP_TOKEN_KEY_BOMB
+
+#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
+{
+  int type;
+  void *value;
+  char *text;
+} token_info[] =
+{
+  { 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_STRING,  &si.alias_name,	"alias_name"			},
+
+  /* for each player: */
+  { 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"		}
+};
+
+static char *string_tolower(char *s)
 {
+  static char s_lower[100];
   int i;
-  char filename[MAX_FILENAME];
-  FILE *file;
-  BOOL new_tape = TRUE;
 
-  sprintf(filename,"%s/%s/%d.tape",
-	  LEVEL_PATH,leveldir[leveldir_nr].filename,level_nr);
+  if (strlen(s) >= 100)
+    return s;
 
-  /* Testen, ob bereits eine Aufnahme existiert */
-  if ((file=fopen(filename,"r")))
+  strcpy(s_lower, s);
+
+  for (i=0; i<strlen(s_lower); i++)
+    s_lower[i] = tolower(s_lower[i]);
+
+  return s_lower;
+}
+
+static int get_string_integer_value(char *s)
+{
+  static char *number_text[][3] =
   {
-    new_tape = FALSE;
-    fclose(file);
+    { "0", "zero", "null", },
+    { "1", "one", "first" },
+    { "2", "two", "second" },
+    { "3", "three", "third" },
+    { "4", "four", "fourth" },
+    { "5", "five", "fifth" },
+    { "6", "six", "sixth" },
+    { "7", "seven", "seventh" },
+    { "8", "eight", "eighth" },
+    { "9", "nine", "ninth" },
+    { "10", "ten", "tenth" },
+    { "11", "eleven", "eleventh" },
+    { "12", "twelve", "twelfth" },
+  };
+
+  int i, j;
+
+  for (i=0; i<13; i++)
+    for (j=0; j<3; j++)
+      if (strcmp(string_tolower(s), number_text[i][j]) == 0)
+	return i;
+
+  return atoi(s);
+}
 
-    if (!AreYouSure("Replace old tape ?",AYS_ASK))
-      return;
+static boolean get_string_boolean_value(char *s)
+{
+  if (strcmp(string_tolower(s), "true") == 0 ||
+      strcmp(string_tolower(s), "yes") == 0 ||
+      strcmp(string_tolower(s), "on") == 0 ||
+      get_string_integer_value(s) == 1)
+    return TRUE;
+  else
+    return FALSE;
+}
+
+
+
+#if 0
+
+static char *getSetupToken(int token_nr)
+{
+  return token_info[token_nr].text;
+}
+
+static char *getSetupValue(int token_nr, boolean token_value)
+{
+  return (token_value == TRUE ? "true" : "false");
+
+  /*
+  if (token_value == TRUE)
+    return token_info[token_nr].value_true;
+  else
+    return token_info[token_nr].value_false;
+  */
+
+}
+
+#endif
+
+
+
+static char *getFormattedSetupEntry(char *token, char *value)
+{
+  int i;
+  static char entry[MAX_LINE_LEN];
+
+  sprintf(entry, "%s:", token);
+  for (i=strlen(entry); i<TOKEN_VALUE_POSITION; i++)
+    entry[i] = ' ';
+  entry[i] = '\0';
+
+  strcat(entry, value);
+
+  return entry;
+}
+
+
+
+#if 0
+
+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);
   }
 
-  if (!(file=fopen(filename,"w")))
+  return entry;
+}
+
+#endif
+
+
+static void freeSetupFileList(struct SetupFileList *setup_file_list)
+{
+  if (!setup_file_list)
+    return;
+
+  if (setup_file_list->token)
+    free(setup_file_list->token);
+  if (setup_file_list->value)
+    free(setup_file_list->value);
+  if (setup_file_list->next)
+    freeSetupFileList(setup_file_list->next);
+  free(setup_file_list);
+}
+
+static struct SetupFileList *newSetupFileList(char *token, char *value)
+{
+  struct SetupFileList *new = checked_malloc(sizeof(struct SetupFileList));
+
+  new->token = checked_malloc(strlen(token) + 1);
+  strcpy(new->token, token);
+
+  new->value = checked_malloc(strlen(value) + 1);
+  strcpy(new->value, value);
+
+  new->next = NULL;
+
+  return new;
+}
+
+static char *getSetupFileListEntry(struct SetupFileList *setup_file_list,
+				   char *token)
+{
+  if (!setup_file_list)
+    return NULL;
+
+  if (strcmp(setup_file_list->token, token) == 0)
+    return setup_file_list->value;
+  else
+    return getSetupFileListEntry(setup_file_list->next, token);
+}
+
+boolean setSetupFileListEntry(struct SetupFileList *setup_file_list,
+			      char *token, char *value)
+{
+  if (!setup_file_list)
+    return FALSE;
+
+  if (strcmp(setup_file_list->token, token) == 0)
   {
-    fprintf(stderr,"%s: cannot save level recording file '%s'!\n",
-	    progname,filename);
+    free(setup_file_list->value);
+    setup_file_list->value = checked_malloc(strlen(value) + 1);
+    strcpy(setup_file_list->value, value);
+
+    return TRUE;
+  }
+  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);
   }
+}
 
-  fputs(LEVELREC_COOKIE,file);		/* Formatkennung */
-  fputc(0x0a,file);
+#ifdef DEBUG
+static void printSetupFileList(struct SetupFileList *setup_file_list)
+{
+  if (!setup_file_list)
+    return;
 
-  tape = master_tape;
+  printf("token: '%s'\n", setup_file_list->token);
+  printf("value: '%s'\n", setup_file_list->value);
 
-  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);
+  printSetupFileList(setup_file_list->next);
+}
+#endif
 
-  fputc((tape.date >>  24) & 0xff,file);
-  fputc((tape.date >>  16) & 0xff,file);
-  fputc((tape.date >>   8) & 0xff,file);
-  fputc((tape.date >>   0) & 0xff,file);
+static struct SetupFileList *loadSetupFileList(char *filename)
+{
+  int line_len;
+  char line[MAX_LINE_LEN];
+  char *token, *value, *line_ptr;
+  struct SetupFileList *setup_file_list = newSetupFileList("", "");
+  struct SetupFileList *first_valid_list_entry;
 
-  fputc((tape.length >>  24) & 0xff,file);
-  fputc((tape.length >>  16) & 0xff,file);
-  fputc((tape.length >>   8) & 0xff,file);
-  fputc((tape.length >>   0) & 0xff,file);
+  FILE *file;
 
-  for(i=0;i<tape.length;i++)
+  if (!(file = fopen(filename, "r")))
   {
-    fputc(tape.pos[i].joystickdata,file);
-    fputc(tape.pos[i].delay,file);
+    Error(ERR_WARN, "cannot open setup file '%s'", filename);
+    return NULL;
+  }
+
+  while(!feof(file))
+  {
+    /* 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);
+
+    /* 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++)
+    {
+      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)
+      updateSetupFileListEntry(setup_file_list, token, value);
   }
 
   fclose(file);
 
-  chmod(filename, LEVREC_PERMS);
+  first_valid_list_entry = setup_file_list->next;
 
-  if (new_tape)
-    AreYouSure("tape saved !",AYS_CONFIRM);
+  /* free empty list header */
+  setup_file_list->next = NULL;
+  freeSetupFileList(setup_file_list);
+
+  if (!first_valid_list_entry)
+    Error(ERR_WARN, "setup file is empty");
+
+  return first_valid_list_entry;
 }
 
-void SaveScore(int level_nr)
+static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
+					 char *identifier)
 {
-  int i,j;
-  char filename[MAX_FILENAME];
-  FILE *file;
+  if (!setup_file_list)
+    return;
 
-  sprintf(filename,"%s/%s/%s",
-	  SCORE_PATH,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+  if (strcmp(setup_file_list->token, TOKEN_STR_FILE_IDENTIFIER) == 0)
+  {
+    if (strcmp(setup_file_list->value, identifier) != 0)
+    {
+      Error(ERR_WARN, "setup file has wrong version");
+      return;
+    }
+    else
+      return;
+  }
 
-  if (!(file=fopen(filename,"r+")))
+  if (setup_file_list->next)
+    checkSetupFileListIdentifier(setup_file_list->next, identifier);
+  else
   {
-    fprintf(stderr,"%s: cannot save score for level %d!\n",
-	    progname,level_nr);
+    Error(ERR_WARN, "setup file has no version information");
     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++)
+static void decodeSetupFileList(struct SetupFileList *setup_file_list)
+{
+  int i;
+  int token_nr = TOKEN_INVALID;
+  int player_nr = 0;
+  char *token;
+  char *token_value;
+  boolean token_boolean_value;
+  int token_integer_value;
+  int token_player_prefix_len;
+
+  if (!setup_file_list)
+    return;
+
+  token = setup_file_list->token;
+  token_value = setup_file_list->value;
+  token_boolean_value = get_string_boolean_value(token_value);
+  token_integer_value = get_string_integer_value(token_value);
+
+  token_player_prefix_len = strlen(TOKEN_STR_PLAYER_PREFIX);
+
+  if (strncmp(token, TOKEN_STR_PLAYER_PREFIX,
+	      token_player_prefix_len) == 0)
   {
-    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);
+    token += token_player_prefix_len;
+
+    if (*token >= '0' && *token <= '9')
+    {
+      player_nr = ((int)(*token - '0') - 1 + MAX_PLAYERS) % MAX_PLAYERS;
+      token++;
+    }
   }
-  fclose(file);
+
+  for (i=0; i<NUM_SETUP_TOKENS; i++)
+  {
+    if (strcmp(token, token_info[i].text) == 0)
+    {
+      token_nr = i;
+      break;
+    }
+  }
+
+  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;
+
+  switch (token_nr)
+  {
+    case SETUP_TOKEN_SOUND:
+      setup.sound = token_boolean_value;
+      break;
+    case SETUP_TOKEN_SOUND_LOOPS:
+      setup.sound_loops = token_boolean_value;
+      break;
+    case SETUP_TOKEN_SOUND_MUSIC:
+      setup.sound_music = token_boolean_value;
+      break;
+    case SETUP_TOKEN_SOUND_SIMPLE:
+      setup.sound_simple = token_boolean_value;
+      break;
+    case SETUP_TOKEN_TOONS:
+      setup.toons = token_boolean_value;
+      break;
+    case SETUP_TOKEN_DOUBLE_BUFFERING:
+      setup.double_buffering = token_boolean_value;
+      break;
+    case SETUP_TOKEN_SCROLL_DELAY:
+      setup.scroll_delay = token_boolean_value;
+      break;
+    case SETUP_TOKEN_SOFT_SCROLLING:
+      setup.soft_scrolling = token_boolean_value;
+      break;
+    case SETUP_TOKEN_FADING:
+      setup.fading = token_boolean_value;
+      break;
+    case SETUP_TOKEN_AUTORECORD:
+      setup.autorecord = token_boolean_value;
+      break;
+    case SETUP_TOKEN_QUICK_DOORS:
+      setup.quick_doors = token_boolean_value;
+      break;
+
+    case SETUP_TOKEN_ALIAS_NAME:
+      strncpy(setup.alias_name, token_value, MAX_NAMELEN-1);
+      setup.alias_name[MAX_NAMELEN-1] = '\0';
+      break;
+
+    case SETUP_TOKEN_USE_JOYSTICK:
+      setup.input[player_nr].use_joystick = token_boolean_value;
+      break;
+    case SETUP_TOKEN_JOY_DEVICE_NAME:
+      strncpy(setup.input[player_nr].joy.device_name, token_value,
+	      MAX_FILENAME_LEN-1);
+      setup.input[player_nr].joy.device_name[MAX_FILENAME_LEN-1] = '\0';
+      break;
+    case SETUP_TOKEN_JOY_SNAP:
+      setup.input[player_nr].joy.snap = getJoySymbolFromJoyName(token_value);
+      break;
+    case SETUP_TOKEN_JOY_XLEFT:
+      setup.input[player_nr].joy.xleft = token_integer_value;
+      break;
+    case SETUP_TOKEN_JOY_XMIDDLE:
+      setup.input[player_nr].joy.xmiddle = token_integer_value;
+      break;
+    case SETUP_TOKEN_JOY_XRIGHT:
+      setup.input[player_nr].joy.xright = token_integer_value;
+      break;
+    case SETUP_TOKEN_JOY_YUPPER:
+      setup.input[player_nr].joy.yupper = token_integer_value;
+      break;
+    case SETUP_TOKEN_JOY_YMIDDLE:
+      setup.input[player_nr].joy.ymiddle = token_integer_value;
+      break;
+    case SETUP_TOKEN_JOY_YLOWER:
+      setup.input[player_nr].joy.ylower = token_integer_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);
+      break;
+
+    case TOKEN_INVALID:
+      Error(ERR_WARN, "unknown token '%s' not recognized", token);
+      break;
+
+    case TOKEN_IGNORE:
+    default:
+      break;
+  }
+
+  decodeSetupFileList(setup_file_list->next);
 }
 
-void SavePlayerInfo(int mode)
+int getLevelSeriesNrFromLevelSeriesName(char *level_series_name)
 {
   int i;
-  char filename[MAX_FILENAME];
-  char cookie[MAX_FILENAME];
-  FILE *file;
-  struct PlayerInfo default_player;
 
-  if (mode==PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-	    NAMES_PATH,leveldir[leveldir_nr].filename,NAMES_FILENAME);
+  if (!level_series_name)
+    return 0;
+
+  for (i=0; i<num_leveldirs; i++)
+    if (strcmp(level_series_name, leveldir[i].filename) == 0)
+      return i;
+
+  return 0;
+}
+
+int getLastPlayedLevelOfLevelSeries(char *level_series_name)
+{
+  char *token_value;
+  int level_series_nr = getLevelSeriesNrFromLevelSeriesName(level_series_name);
+  int last_level_nr = 0;
+
+  if (!level_series_name)
+    return 0;
+
+  token_value = getSetupFileListEntry(level_setup_list, level_series_name);
+
+  if (token_value)
+  {
+    int highest_level_nr = leveldir[level_series_nr].levels - 1;
+
+    last_level_nr = atoi(token_value);
+
+    if (last_level_nr < 0)
+      last_level_nr = 0;
+    if (last_level_nr > highest_level_nr)
+      last_level_nr = highest_level_nr;
+  }
+
+  return last_level_nr;
+}
+
+void LoadSetup()
+{
+  int i;
+  char filename[MAX_FILENAME_LEN];
+  struct SetupFileList *setup_file_list = NULL;
+
+  /* always start with reliable default setup values */
+
+  setup.sound = TRUE;
+  setup.sound_loops = FALSE;
+  setup.sound_music = FALSE;
+  setup.sound_simple = FALSE;
+  setup.toons = TRUE;
+  setup.double_buffering = TRUE;
+  setup.direct_draw = !setup.double_buffering;
+  setup.scroll_delay = FALSE;
+  setup.soft_scrolling = TRUE;
+  setup.fading = FALSE;
+  setup.autorecord = FALSE;
+  setup.quick_doors = FALSE;
+
+  strncpy(setup.login_name, GetLoginName(), MAX_NAMELEN-1);
+  setup.login_name[MAX_NAMELEN-1] = '\0';
+  strncpy(setup.alias_name, GetLoginName(), MAX_NAMELEN-1);
+  setup.alias_name[MAX_NAMELEN-1] = '\0';
+
+  for (i=0; i<MAX_PLAYERS; i++)
+  {
+    setup.input[i].use_joystick = FALSE;
+    strcpy(setup.input[i].joy.device_name, joystick_device_name[i]);
+    setup.input[i].joy.xleft   = JOYSTICK_XLEFT;
+    setup.input[i].joy.xmiddle = JOYSTICK_XMIDDLE;
+    setup.input[i].joy.xright  = JOYSTICK_XRIGHT;
+    setup.input[i].joy.yupper  = JOYSTICK_YUPPER;
+    setup.input[i].joy.ymiddle = JOYSTICK_YMIDDLE;
+    setup.input[i].joy.ylower  = JOYSTICK_YLOWER;
+    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);
+  }
+
+  sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
+
+  setup_file_list = loadSetupFileList(filename);
+
+  if (setup_file_list)
+  {
+
+#if 0
+    printSetupFileList(setup_file_list);
+#endif
+
+    checkSetupFileListIdentifier(setup_file_list, SETUP_COOKIE);
+    decodeSetupFileList(setup_file_list);
+
+    setup.direct_draw = !setup.double_buffering;
+
+    freeSetupFileList(setup_file_list);
+  }
   else
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
+    Error(ERR_WARN, "using default setup values");
+}
 
-  if (!(file=fopen(filename,"r+")))
+
+#if 0
+
+void SaveSetup()
+{
+  int i;
+  char filename[MAX_FILENAME_LEN];
+  FILE *file;
+
+  sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
+
+  if (!(file = fopen(filename, "w")))
   {
-    fprintf(stderr,"%s: cannot save player information '%s'!\n",
-	    progname,filename);
+    Error(ERR_WARN, "cannot write setup file '%s'", filename);
     return;
   }
 
-  fgets(cookie,NAMES_COOKIE_LEN,file);
-  if (strcmp(cookie,NAMES_COOKIE))	/* ungültiges Format? */
+  fprintf(file, "%s:              %s\n",
+	  TOKEN_STR_FILE_IDENTIFIER, SETUP_COOKIE);
+
+  fprintf(file, "\n");
+
+  fprintf(file, "%s\n",
+	  getSetupEntry("", SETUP_TOKEN_SOUND,
+			setup.sound));
+  fprintf(file, "%s\n",
+	  getSetupEntry("", SETUP_TOKEN_SOUND_LOOPS,
+			setup.sound_loops));
+  fprintf(file, "%s\n",
+	  getSetupEntry("", SETUP_TOKEN_SOUND_MUSIC,
+			setup.sound_music));
+  fprintf(file, "%s\n",
+	  getSetupEntry("", SETUP_TOKEN_SOUND_SIMPLE,
+			setup.sound_simple));
+  fprintf(file, "%s\n",
+	  getSetupEntry("", SETUP_TOKEN_TOONS,
+			setup.toons));
+  fprintf(file, "%s\n",
+	  getSetupEntry("", SETUP_TOKEN_DIRECT_DRAW,
+			setup.direct_draw));
+  fprintf(file, "%s\n",
+	  getSetupEntry("", SETUP_TOKEN_SCROLL_DELAY,
+			setup.scroll_delay));
+  fprintf(file, "%s\n",
+	  getSetupEntry("", SETUP_TOKEN_SOFT_SCROLLING,
+			setup.soft_scrolling));
+  fprintf(file, "%s\n",
+	  getSetupEntry("", SETUP_TOKEN_FADING,
+			setup.fading));
+  fprintf(file, "%s\n",
+	  getSetupEntry("", SETUP_TOKEN_AUTORECORD,
+			setup.autorecord));
+  fprintf(file, "%s\n",
+	  getSetupEntry("", SETUP_TOKEN_QUICK_DOORS,
+			setup.quick_doors));
+
+  fprintf(file, "\n");
+
+  fprintf(file, "%s\n",
+	  getFormattedSetupEntry(TOKEN_STR_ALIAS_NAME,
+				 setup.alias_name));
+
+  for (i=0; i<MAX_PLAYERS; i++)
   {
-    fprintf(stderr,"%s: wrong format of names file '%s'!\n",
-	    progname,filename);
-    fclose(file);
-    return;
+    char prefix[30];
+
+    sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, i + 1);
+
+    fprintf(file, "\n");
+
+    fprintf(file, "%s\n",
+	    getSetupEntry(prefix, SETUP_TOKEN_USE_JOYSTICK,
+			  setup.input[i].use_joystick));
+
+    fprintf(file, "%s%s:      %s\n", prefix,
+	    getSetupToken(SETUP_TOKEN_JOY_DEVICE_NAME),
+	    setup.input[i].joy.device_name);
+
+    fprintf(file, "%s%s:      %d\n", prefix,
+	    getSetupToken(SETUP_TOKEN_JOY_XLEFT),
+	    setup.input[i].joy.xleft);
+    fprintf(file, "%s%s:      %d\n", prefix,
+	    getSetupToken(SETUP_TOKEN_JOY_XMIDDLE),
+	    setup.input[i].joy.xmiddle);
+    fprintf(file, "%s%s:      %d\n", prefix,
+	    getSetupToken(SETUP_TOKEN_JOY_XRIGHT),
+	    setup.input[i].joy.xright);
+    fprintf(file, "%s%s:      %d\n", prefix,
+	    getSetupToken(SETUP_TOKEN_JOY_YUPPER),
+	    setup.input[i].joy.yupper);
+    fprintf(file, "%s%s:      %d\n", prefix,
+	    getSetupToken(SETUP_TOKEN_JOY_YMIDDLE),
+	    setup.input[i].joy.ymiddle);
+    fprintf(file, "%s%s:      %d\n", prefix,
+	    getSetupToken(SETUP_TOKEN_JOY_YLOWER),
+	    setup.input[i].joy.ylower);
+    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));
   }
 
-  while(1)
+  fclose(file);
+
+  chmod(filename, SETUP_PERMS);
+}
+
+#endif
+
+
+
+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 *token_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)
   {
-    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);
+    case TYPE_BOOLEAN:
+      strcat(entry, (*(boolean *)token_value ? "true" : "false"));
+      break;
 
-    if (feof(file))		/* Spieler noch nicht in Liste enthalten */
+    case TYPE_SWITCH:
+      strcat(entry, (*(boolean *)token_value ? "on" : "off"));
       break;
-    else			/* prüfen, ob Spieler in Liste enthalten */
-      if (!strncmp(default_player.login_name,player.login_name,MAX_NAMELEN-1))
+
+    case TYPE_KEYSYM:
       {
-	fseek(file,-(2*MAX_NAMELEN+1+2+1),SEEK_CUR);
-	break;
+	KeySym keysym = *(KeySym *)token_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;
 
-  for(i=0;i<MAX_NAMELEN;i++)
-    fputc(player.login_name[i],file);
-  for(i=0;i<MAX_NAMELEN;i++)
-    fputc(player.alias_name[i],file);
-  fputc(player.handicap,file);
-  fputc(player.setup / 256,file);
-  fputc(player.setup % 256,file);
-  fputc(player.leveldir_nr,file);
+    case TYPE_INTEGER:
+      {
+	char buffer[MAX_LINE_LEN];
 
-  fclose(file);
+	sprintf(buffer, "%d", *(int *)token_value);
+	strcat(entry, buffer);
+      }
+      break;
+
+    case TYPE_STRING:
+      strcat(entry, *(char **)token_value);
+      break;
+
+    default:
+      break;
+  }
+
+  return entry;
 }
 
-void LoadJoystickData()
+void SaveSetup()
 {
-  int i;
-  char cookie[256];
+  int i, pnr;
+  char filename[MAX_FILENAME_LEN];
   FILE *file;
 
-  if (joystick_status==JOYSTICK_OFF)
-    return;
-
-  if (!(file=fopen(JOYDAT_FILE,"r")))
-    return;
+  sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
 
-  fscanf(file,"%s",cookie);
-  if (strcmp(cookie,JOYSTICK_COOKIE))	/* ungültiges Format? */
+  if (!(file = fopen(filename, "w")))
   {
-    fprintf(stderr,"%s: wrong format of joystick file!\n",progname);
-    fclose(file);
+    Error(ERR_WARN, "cannot write setup file '%s'", filename);
     return;
   }
 
-  for(i=0;i<2;i++)
+  fprintf(file, "%s:              %s\n",
+	  TOKEN_STR_FILE_IDENTIFIER, SETUP_COOKIE);
+
+  fprintf(file, "\n");
+
+  for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++)
+    fprintf(file, "%s\n", getSetupLine("", i));
+
+  for (pnr=0; pnr<MAX_PLAYERS; pnr++)
   {
-    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);
+    char prefix[30];
+
+    sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, i + 1);
+    fprintf(file, "\n");
+
+    for (i=FIRST_PLAYER_SETUP_TOKEN; i<=LAST_PLAYER_SETUP_TOKEN; i++)
+    {
+      sii = setup.input[pnr];
+      fprintf(file, "%s\n", getSetupLine(prefix, i));
+    }
   }
+
   fclose(file);
 
-  CheckJoystickData();
+  chmod(filename, SETUP_PERMS);
 }
 
-void SaveJoystickData()
+void LoadLevelSetup()
 {
-  int i;
+  char filename[MAX_FILENAME_LEN];
+
+  /* always start with reliable default setup values */
+
+  leveldir_nr = 0;
+  level_nr = 0;
+
+  sprintf(filename, "%s/%s", SETUP_PATH, LEVELSETUP_FILENAME);
+
+  if (level_setup_list)
+    freeSetupFileList(level_setup_list);
+
+  level_setup_list = loadSetupFileList(filename);
+
+  if (level_setup_list)
+  {
+    char *last_level_series =
+      getSetupFileListEntry(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES);
+
+    leveldir_nr = getLevelSeriesNrFromLevelSeriesName(last_level_series);
+    level_nr = getLastPlayedLevelOfLevelSeries(last_level_series);
+
+#if 0
+    printSetupFileList(level_setup_list);
+#endif
+
+    checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
+  }
+  else
+    Error(ERR_WARN, "using default setup values");
+}
+
+void SaveLevelSetup()
+{
+  char filename[MAX_FILENAME_LEN];
+  struct SetupFileList *list_entry = level_setup_list;
   FILE *file;
 
-  if (joystick_status==JOYSTICK_OFF)
-    return;
+  updateSetupFileListEntry(level_setup_list,
+			   TOKEN_STR_LAST_LEVEL_SERIES,
+			   leveldir[leveldir_nr].filename);
 
-  CheckJoystickData();
+  updateSetupFileListEntry(level_setup_list,
+			   leveldir[leveldir_nr].filename,
+			   int2str(level_nr, 0));
 
-  if (!(file=fopen(JOYDAT_FILE,"w")))
+  sprintf(filename, "%s/%s", SETUP_PATH, LEVELSETUP_FILENAME);
+
+  if (!(file = fopen(filename, "w")))
   {
-    fprintf(stderr,"%s: cannot save joystick calibration data!\n",progname);
+    Error(ERR_WARN, "cannot write setup file '%s'", filename);
     return;
   }
 
-  fprintf(file,"%s\n",JOYSTICK_COOKIE);	/* Formatkennung */
-  for(i=0;i<2;i++)
+  fprintf(file, "%s:              %s\n\n",
+	  TOKEN_STR_FILE_IDENTIFIER, LEVELSETUP_COOKIE);
+
+  while (list_entry)
   {
-    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);
+    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);
 
-  chmod(JOYDAT_FILE, JOYDAT_PERMS);
+  chmod(filename, SETUP_PERMS);
 }