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

diff --git a/src/files.c b/src/files.c
index a77b4463..0de480e0 100644
--- a/src/files.c
+++ b/src/files.c
@@ -19,61 +19,6 @@
 #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);
-
-  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);
-
-  chmod(filename, SCORE_PERMS);
-  return(TRUE);
-}
-
-boolean CreateNewNamesFile(int mode)
-{
-  char filename[MAX_FILENAME_LEN];
-  FILE *file;
-
-  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);
-
-  if (!(file=fopen(filename,"w")))
-    return(FALSE);
-
-  fputs(NAMES_COOKIE,file);		/* Formatkennung */
-  fclose(file);
-
-  chmod(filename, NAMES_PERMS);
-  return(TRUE);
-}
-
 boolean LoadLevelInfo()
 {
   int i;
@@ -85,14 +30,14 @@ boolean LoadLevelInfo()
 
   if (!(file=fopen(filename,"r")))
   {
-    Error(ERR_RETURN, "cannot read level info '%s'", 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? */
   {
-    Error(ERR_RETURN, "wrong format of level info file");
+    Error(ERR_WARN, "wrong format of level info file");
     fclose(file);
     return(FALSE);
   }
@@ -113,7 +58,7 @@ boolean LoadLevelInfo()
 
   if (!num_leveldirs)
   {
-    Error(ERR_RETURN, "empty level info '%s'", filename);
+    Error(ERR_WARN, "empty level info '%s'", filename);
     return(FALSE);
   }
 
@@ -131,7 +76,7 @@ void LoadLevel(int level_nr)
 	  level_directory,leveldir[leveldir_nr].filename,level_nr);
 
   if (!(file = fopen(filename,"r")))
-    Error(ERR_RETURN, "cannot read level '%s' - creating new level", filename);
+    Error(ERR_WARN, "cannot read level '%s' - creating new level", filename);
   else
   {
     fgets(cookie,LEVEL_COOKIE_LEN,file);
@@ -139,7 +84,7 @@ void LoadLevel(int level_nr)
 
     if (strcmp(cookie,LEVEL_COOKIE))	/* ungültiges Format? */
     {
-      Error(ERR_RETURN, "wrong format of level file '%s'", filename);
+      Error(ERR_WARN, "wrong format of level file '%s'", filename);
       fclose(file);
       file = NULL;
     }
@@ -210,6 +155,56 @@ 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;
@@ -234,7 +229,7 @@ void LoadLevelTape(int level_nr)
       levelrec_10 = TRUE;
     else if (strcmp(cookie,LEVELREC_COOKIE))	/* unknown tape format */
     {
-      Error(ERR_RETURN, "wrong format of level recording file '%s'", filename);
+      Error(ERR_WARN, "wrong format of level recording file '%s'", filename);
       fclose(file);
       file = NULL;
     }
@@ -284,238 +279,11 @@ void LoadLevelTape(int level_nr)
   fclose(file);
 
   if (i != tape.length)
-    Error(ERR_RETURN, "level recording file '%s' corrupted", filename);
+    Error(ERR_WARN, "level recording file '%s' corrupted", filename);
 
   tape.length_seconds = GetTapeLength();
 }
 
-void LoadScore(int level_nr)
-{
-  int i,j;
-  char filename[MAX_FILENAME_LEN];
-  char cookie[MAX_FILENAME_LEN];
-  FILE *file;
-
-  sprintf(filename,"%s/%s/%s",
-	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
-
-  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);
-  }
-
-  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;
-    }
-  }
-
-  if (file)
-  {
-    fseek(file,
-	  SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)),
-	  SEEK_SET);
-    for(i=0;i<MAX_SCORE_ENTRIES;i++)
-    {
-      for(j=0;j<MAX_NAMELEN;j++)
-	highscore[i].Name[j] = fgetc(file);
-      highscore[i].Score = (fgetc(file)<<8) | fgetc(file);
-    }
-    fclose(file);
-  }
-  else
-  {
-    for(i=0;i<MAX_SCORE_ENTRIES;i++)
-    {
-      strcpy(highscore[i].Name,EMPTY_ALIAS);
-      highscore[i].Score = 0;
-    }
-  }
-}
-
-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);
-
-  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;
-
-  new_player = default_player;
-
-  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);
-  }
-
-  if (file)
-  {
-    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? */
-    {
-      Error(ERR_RETURN, "wrong format of names file '%s'", filename);
-      fclose(file);
-      file = NULL;
-    }
-  }
-
-  if (!file)
-  {
-    *local_player = default_player;
-    level_nr = default_player.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 (!version_10_file)
-    {
-      new_player.level_nr = fgetc(file);
-      for(i=0;i<10;i++)		/* currently unused bytes */
-	fgetc(file);
-    }
-    else
-      new_player.level_nr = new_player.handicap;
-
-    if (feof(file))		/* Spieler noch nicht in Liste enthalten */
-    {
-      new_player = default_player;
-
-      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;
-    }
-    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;
-  }
-
-  level_nr = local_player->level_nr;
-
-  if (file)
-    fclose(file);
-}
-
-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_RETURN, "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 SaveLevelTape(int level_nr)
 {
   int i;
@@ -543,7 +311,7 @@ void SaveLevelTape(int level_nr)
 
   if (!(file=fopen(filename,"w")))
   {
-    Error(ERR_RETURN, "cannot save level recording file '%s'", filename);
+    Error(ERR_WARN, "cannot save level recording file '%s'", filename);
     return;
   }
 
@@ -585,252 +353,211 @@ void SaveLevelTape(int level_nr)
     Request("tape saved !",REQ_CONFIRM);
 }
 
-void SaveScore(int level_nr)
+boolean CreateNewScoreFile()
 {
-  int i,j;
+  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,"r+")))
-  {
-    Error(ERR_RETURN, "cannot save score for level %d", level_nr);
-    return;
-  }
+  if (!(file=fopen(filename,"w")))
+    return(FALSE);
 
-  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(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_NAMELEN;j++)
-      fputc(highscore[i].Name[j],file);
-    fputc(highscore[i].Score / 256,file);
-    fputc(highscore[i].Score % 256,file);
+    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);
 }
 
-void SavePlayerInfo(int mode)
+void LoadScore(int level_nr)
 {
-  int i;
+  int i,j;
   char filename[MAX_FILENAME_LEN];
   char cookie[MAX_FILENAME_LEN];
   FILE *file;
-  struct PlayerInfo default_player;
-  int version_10_file = FALSE;
-
-
-
-  if (mode == PLAYER_SETUP)
-    SaveSetup();
-
 
+  sprintf(filename,"%s/%s/%s",
+	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
 
-  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);
-
-  if (!(file = fopen(filename,"r+")))
-  {
-    Error(ERR_RETURN, "cannot save player information to file '%s'", filename);
-    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? */
+  if (!(file = fopen(filename,"r")))
   {
-    Error(ERR_RETURN, "wrong format of names file '%s'", filename);
-    fclose(file);
-    return;
+    if (!CreateNewScoreFile())
+      Error(ERR_WARN, "cannot create score file '%s'", filename);
+    else if (!(file = fopen(filename,"r"))) 
+      Error(ERR_WARN, "cannot read score for level %d", level_nr);
   }
 
-  while(1)
+  if (file)
   {
-    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)
+    fgets(cookie,SCORE_COOKIE_LEN,file);
+    if (strcmp(cookie,SCORE_COOKIE))	/* ungültiges Format? */
     {
-      default_player.level_nr = fgetc(file);
-      for(i=0;i<10;i++)		/* currently unused bytes */
-	fgetc(file);
+      Error(ERR_WARN, "wrong format of score file '%s'", filename);
+      fclose(file);
+      file = NULL;
     }
-    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))
-      {
-	fseek(file,-(2*MAX_NAMELEN+1+2+1+(version_10_file ? 0 : 11)),SEEK_CUR);
-	break;
-      }
-  }
-
-  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);
   }
 
-  fclose(file);
-}
-
-void LoadJoystickData()
-{
-  int i;
-  char cookie[256];
-  FILE *file;
-
-  if (joystick_status==JOYSTICK_OFF)
-    return;
-
-#ifndef MSDOS
-  if (!(file=fopen(JOYDAT_FILE,"r")))
-    return;
-
-  fscanf(file,"%s",cookie);
-  if (strcmp(cookie,JOYSTICK_COOKIE))	/* ungültiges Format? */
+  if (file)
   {
-    Error(ERR_RETURN, "wrong format of joystick file '%s'", JOYDAT_FILE);
+    fseek(file,
+	  SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)),
+	  SEEK_SET);
+    for(i=0;i<MAX_SCORE_ENTRIES;i++)
+    {
+      for(j=0;j<MAX_NAMELEN;j++)
+	highscore[i].Name[j] = fgetc(file);
+      highscore[i].Score = (fgetc(file)<<8) | fgetc(file);
+    }
     fclose(file);
-    return;
   }
-
-  for(i=0;i<2;i++)
+  else
   {
-    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);
+    for(i=0;i<MAX_SCORE_ENTRIES;i++)
+    {
+      strcpy(highscore[i].Name,EMPTY_ALIAS);
+      highscore[i].Score = 0;
+    }
   }
-  fclose(file);
-
-  CheckJoystickData();
-#else
-  load_joystick_data(JOYDAT_FILE);
-#endif
 }
 
-void SaveJoystickData()
+void SaveScore(int level_nr)
 {
-  int i;
+  int i,j;
+  char filename[MAX_FILENAME_LEN];
   FILE *file;
 
-  if (joystick_status==JOYSTICK_OFF)
-    return;
-
-#ifndef MSDOS
-  CheckJoystickData();
+  sprintf(filename,"%s/%s/%s",
+	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
 
-  if (!(file=fopen(JOYDAT_FILE,"w")))
+  if (!(file=fopen(filename,"r+")))
   {
-    Error(ERR_RETURN, "cannot save joystick calibration data to file '%s'",
-	  JOYDAT_FILE);
+    Error(ERR_WARN, "cannot save score for level %d", level_nr);
     return;
   }
 
-  fprintf(file,"%s\n",JOYSTICK_COOKIE);	/* Formatkennung */
-  for(i=0;i<2;i++)
+  fseek(file,
+	SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)),
+	SEEK_SET);
+  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);
+    for(j=0;j<MAX_NAMELEN;j++)
+      fputc(highscore[i].Name[j],file);
+    fputc(highscore[i].Score / 256,file);
+    fputc(highscore[i].Score % 256,file);
   }
   fclose(file);
+}
 
-  chmod(JOYDAT_FILE, JOYDAT_PERMS);
-#else
-  save_joystick_data(JOYDAT_FILE);
-#endif
+#define MAX_LINE_LEN			1000
 
-}
+#define TOKEN_STR_FILE_IDENTIFIER	"file_identifier"
+#define TOKEN_STR_LAST_LEVEL_SERIES	"last_level_series"
+#define TOKEN_STR_PLAYER_PREFIX		"player_"
 
-/* ------------------------------------------------------------------------- */
-/* new setup functions                                                       */
-/* ------------------------------------------------------------------------- */
+#define TOKEN_VALUE_POSITION		30
 
 #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_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_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_"
-
+#define SETUP_TOKEN_ALIAS_NAME		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_NAME
+
+#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
 {
-  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" },
+  { 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: */
-  { ".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",		"", "" }
+  { 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)
@@ -875,7 +602,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 +616,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)
-{
-  int i;
-  static char entry[80];
-
-  sprintf(entry, "%s%s:", prefix, getSetupToken(token_nr));
-  for (i=strlen(entry); i<30; 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)
+static char *getFormattedSetupEntry(char *token, char *value)
 {
   int i;
-  static char entry[80];
-  char *keyname = getKeyNameFromKeySym(keysym);
+  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, 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,226 +660,68 @@ 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);
 }
 
-#ifdef DEBUG
-static void printSetupFileInfo(struct SetupFileInfo *setup_file_info)
+static void setTokenValue(struct SetupFileList *setup_file_list,
+			  char *token, char *value)
 {
-  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);
-
-  printSetupFileInfo(setup_file_info->next);
+  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);
 }
-#endif
 
-static void decodeSetupFileInfo(struct SetupFileInfo *setup_file_info)
+#ifdef DEBUG
+static void printSetupFileList(struct SetupFileList *setup_file_list)
 {
-  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)
+  if (!setup_file_list)
     return;
 
-  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);
-
-  token_player_prefix_len = strlen(SETUP_TOKEN_PLAYER_PREFIX);
-
-  if (strncmp(token, SETUP_TOKEN_PLAYER_PREFIX, token_player_prefix_len) == 0)
-  {
-    token += token_player_prefix_len;
-
-    if (*token >= '0' && *token <= '9')
-    {
-      player_nr = ((int)(*token - '0') - 1 + MAX_PLAYERS) % MAX_PLAYERS;
-      token++;
-    }
-  }
-
-  for (i=0; i<NUM_SETUP_TOKENS; i++)
-  {
-    if (strcmp(token, setup_info[i].token) == 0)
-    {
-      token_nr = i;
-      break;
-    }
-  }
-
-
-
-  /*
-  printf("token == '%s', token_integer_value == %d\n",
-	 token, token_integer_value);
-
-
-  printf("[player %d] token == '%s', token_value == '%s' (%ld)\n",
-	 player_nr, token, token_value,
-	 (unsigned long)getKeySymFromX11KeyName(token_value));
-  */
-
-
-
-  switch (token_nr)
-  {
-    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;
-      break;
-
-    case SETUP_TOKEN_USE_JOYSTICK:
-      setup.input[player_nr].use_joystick = token_boolean_value;
-      break;
-    case SETUP_TOKEN_JOYSTICK_NR:
-      if (token_integer_value < 0 || token_integer_value > 1)
-	token_integer_value = 1;
-      setup.input[player_nr].joystick_nr = token_integer_value - 1;
-      break;
-    case SETUP_TOKEN_JOY_SNAP:
-      setup.input[player_nr].joy.snap = getJoySymbolFromJoyName(token_value);
-      break;
-    case SETUP_TOKEN_JOY_BOMB    :
-      setup.input[player_nr].joy.bomb = getJoySymbolFromJoyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_LEFT:
-      setup.input[player_nr].key.left = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_RIGHT:
-      setup.input[player_nr].key.right = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_UP:
-      setup.input[player_nr].key.up = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_DOWN:
-      setup.input[player_nr].key.down = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_SNAP:
-      setup.input[player_nr].key.snap = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_BOMB:
-      setup.input[player_nr].key.bomb = getKeySymFromX11KeyName(token_value);
-      break;
-    default:
-      break;
-  }
+  printf("token: '%s'\n", setup_file_list->token);
+  printf("value: '%s'\n", setup_file_list->value);
 
-  decodeSetupFileInfo(setup_file_info->next);
+  printSetupFileList(setup_file_list->next);
 }
+#endif
 
-void LoadSetup()
+static struct SetupFileList *loadSetupFileList(char *filename)
 {
   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;
-
+  struct SetupFileList *setup_file_list = newSetupFileList("", "");
+  struct SetupFileList *first_valid_list_entry;
 
-
-  printf("LoadSetup\n");
-
-
-
-  sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
+  FILE *file;
 
   if (!(file = fopen(filename, "r")))
   {
-    int i;
-
-    Error(ERR_RETURN, "cannot open setup file '%s'", filename);
-
-    /* use default values for setup */
-
-    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;
-
-    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);
-    }
-
-    return;
+    Error(ERR_WARN, "cannot open setup file '%s'", filename);
+    return NULL;
   }
 
-
-
-  /*
-  next_entry = &setup_file;
-  */
-
-
-
   while(!feof(file))
   {
-    /* read next line */
+    /* read next line of input file */
     if (!fgets(line, MAX_LINE_LEN, file))
       break;
 
@@ -1217,12 +746,6 @@ void LoadSetup()
 
     line_len = strlen(line);
 
-
-    /*
-    printf("line: '%s'\n", line);
-    */
-
-
     /* cut leading whitespaces from token */
     for (token = line; *token; token++)
       if (*token != ' ' && *token != '\t')
@@ -1248,139 +771,400 @@ void LoadSetup()
       if (*value != ' ' && *value != '\t')
 	break;
 
+    if (*token && *value)
+      setTokenValue(setup_file_list, token, value);
+  }
 
-    /*
-    printf("token / value: '%s' / '%s'\n", token, value);
-    */
+  fclose(file);
 
+  first_valid_list_entry = setup_file_list->next;
 
-    if (*token && *value)
-    {
-      /* allocate new token/value pair */
+  /* 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;
+}
+
+static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
+					 char *identifier)
+{
+  if (!setup_file_list)
+    return;
 
-      *next_entry = newSetupFileInfo(token, value);
-      next_entry = &((*next_entry)->next);
+  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;
   }
 
-  fclose(file);
+  if (setup_file_list->next)
+    checkSetupFileListIdentifier(setup_file_list->next, identifier);
+  else
+  {
+    Error(ERR_WARN, "setup file has no version information");
+    return;
+  }
+}
 
-#if 0
-  printf("Content of setup file info:\n");
+static void setSetupInfoToDefaults(struct SetupInfo *si)
+{
+  int i;
 
-  printSetupFileInfo(setup_file_info);
-#endif
+  si->sound = TRUE;
+  si->sound_loops = FALSE;
+  si->sound_music = FALSE;
+  si->sound_simple = FALSE;
+  si->toons = TRUE;
+  si->double_buffering = TRUE;
+  si->direct_draw = !si->double_buffering;
+  si->scroll_delay = FALSE;
+  si->soft_scrolling = TRUE;
+  si->fading = FALSE;
+  si->autorecord = FALSE;
+  si->quick_doors = FALSE;
+
+  strncpy(si->login_name, GetLoginName(), MAX_NAMELEN-1);
+  si->login_name[MAX_NAMELEN-1] = '\0';
+  strncpy(si->alias_name, GetLoginName(), MAX_NAMELEN-1);
+  si->alias_name[MAX_NAMELEN-1] = '\0';
 
+  for (i=0; i<MAX_PLAYERS; i++)
+  {
+    si->input[i].use_joystick = FALSE;
+    strcpy(si->input[i].joy.device_name, 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;
+
+  /* set setup field to corresponding token value */
+  switch (token_type)
+  {
+    case TYPE_BOOLEAN:
+    case TYPE_SWITCH:
+      *(boolean *)setup_value = get_string_boolean_value(token_value);
+      break;
 
-  printf("decodeSetupFileInfo\n");
+    case TYPE_KEYSYM:
+      *(KeySym *)setup_value = getKeySymFromX11KeyName(token_value);
+      break;
 
+    case TYPE_INTEGER:
+      *(int *)setup_value = get_string_integer_value(token_value);
+      break;
 
+    case TYPE_STRING:
+      strcpy((char *)setup_value, token_value);
+      break;
 
-  decodeSetupFileInfo(setup_file_info);
-  freeSetupFileInfo(setup_file_info);
+    default:
+      break;
+  }
 }
 
-void SaveSetup()
+static void decodeSetupFileList(struct SetupFileList *setup_file_list)
+{
+  int i, pnr;
+
+  if (!setup_file_list)
+    return;
+
+  /* handle global setup values */
+  si = setup;
+  for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++)
+    setSetupInfo(i, getTokenValue(setup_file_list, token_info[i].text));
+  setup = si;
+
+  /* handle player specific setup values */
+  for (pnr=0; pnr<MAX_PLAYERS; pnr++)
+  {
+    char prefix[30];
+
+    sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, pnr + 1);
+
+    sii = setup.input[pnr];
+    for (i=FIRST_PLAYER_SETUP_TOKEN; i<=LAST_PLAYER_SETUP_TOKEN; i++)
+    {
+      char full_token[100];
+
+      sprintf(full_token, "%s%s", prefix, token_info[i].text);
+      setSetupInfo(i, getTokenValue(setup_file_list, full_token));
+    }
+    setup.input[pnr] = sii;
+  }
+}
+
+int getLevelSeriesNrFromLevelSeriesName(char *level_series_name)
 {
   int i;
+
+  if (!level_series_name)
+    return 0;
+
+  for (i=0; i<num_leveldirs; i++)
+    if (strcmp(level_series_name, leveldir[i].filename) == 0)
+      return i;
+
+  return 0;
+}
+
+int getLastPlayedLevelOfLevelSeries(char *level_series_name)
+{
+  char *token_value;
+  int level_series_nr = getLevelSeriesNrFromLevelSeriesName(level_series_name);
+  int last_level_nr = 0;
+
+  if (!level_series_name)
+    return 0;
+
+  token_value = getTokenValue(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()
+{
   char filename[MAX_FILENAME_LEN];
-  FILE *file;
+  struct SetupFileList *setup_file_list = NULL;
+
+  /* always start with reliable default setup values */
+  setSetupInfoToDefaults(&setup);
+
+  sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
+
+  setup_file_list = loadSetupFileList(filename);
+
+  if (setup_file_list)
+  {
+    checkSetupFileListIdentifier(setup_file_list, SETUP_COOKIE);
+    decodeSetupFileList(setup_file_list);
+
+    setup.direct_draw = !setup.double_buffering;
+
+    freeSetupFileList(setup_file_list);
+  }
+  else
+    Error(ERR_WARN, "using default setup values");
+}
+
+static char *getSetupLine(char *prefix, int token_nr)
+{
+  int i;
+  static char entry[MAX_LINE_LEN];
+  int token_type = token_info[token_nr].type;
+  void *setup_value = token_info[token_nr].value;
+  char *token_text = token_info[token_nr].text;
+
+  /* start with the prefix, token and some spaces to format output line */
+  sprintf(entry, "%s%s:", prefix, token_text);
+  for (i=strlen(entry); i<TOKEN_VALUE_POSITION; i++)
+    strcat(entry, " ");
+
+  /* continue with the token's value (which can have different types) */
+  switch (token_type)
+  {
+    case TYPE_BOOLEAN:
+      strcat(entry, (*(boolean *)setup_value ? "true" : "false"));
+      break;
+
+    case TYPE_SWITCH:
+      strcat(entry, (*(boolean *)setup_value ? "on" : "off"));
+      break;
+
+    case TYPE_KEYSYM:
+      {
+	KeySym keysym = *(KeySym *)setup_value;
+	char *keyname = getKeyNameFromKeySym(keysym);
+
+	strcat(entry, getX11KeyNameFromKeySym(keysym));
+	for (i=strlen(entry); i<50; i++)
+	  strcat(entry, " ");
+
+	/* add comment, if useful */
+	if (strcmp(keyname, "(undefined)") != 0 &&
+	    strcmp(keyname, "(unknown)") != 0)
+	{
+	  strcat(entry, "# ");
+	  strcat(entry, keyname);
+	}
+      }
+      break;
 
+    case TYPE_INTEGER:
+      {
+	char buffer[MAX_LINE_LEN];
 
+	sprintf(buffer, "%d", *(int *)setup_value);
+	strcat(entry, buffer);
+      }
+      break;
 
-  printf("SaveSetup\n");
+    case TYPE_STRING:
+      strcat(entry, (char *)setup_value);
+      break;
+
+    default:
+      break;
+  }
 
+  return entry;
+}
 
+void SaveSetup()
+{
+  int i, pnr;
+  char filename[MAX_FILENAME_LEN];
+  FILE *file;
 
   sprintf(filename, "%s/%s", SETUP_PATH, 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);
     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++)
+  {
+    /* just to make things nicer :) */
+    if (i == SETUP_TOKEN_ALIAS_NAME)
+      fprintf(file, "\n");
 
-  for (i=0; i<MAX_PLAYERS; i++)
+    fprintf(file, "%s\n", getSetupLine("", i));
+  }
+
+  /* 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);
+
+  chmod(filename, SETUP_PERMS);
+}
+
+void LoadLevelSetup()
+{
+  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 =
+      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
+    Error(ERR_WARN, "using default setup values");
+}
+
+void SaveLevelSetup()
+{
+  char filename[MAX_FILENAME_LEN];
+  struct SetupFileList *list_entry = level_setup_list;
+  FILE *file;
+
+  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));
+
+  sprintf(filename, "%s/%s", SETUP_PATH, LEVELSETUP_FILENAME);
+
+  if (!(file = fopen(filename, "w")))
+  {
+    Error(ERR_WARN, "cannot write setup file '%s'", filename);
+    return;
+  }
+
+  fprintf(file, "%s:              %s\n\n",
+	  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);
+
   chmod(filename, SETUP_PERMS);
 }