X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ffiles.c;h=fc7d7a940bc0dff11ad34fd02178a3ee3cf02965;hp=c3cb4b8ddaf769b0566f1f8a38da72a6aa7b7cea;hb=49dab46aa55cb43233c7f9a310593f8bd8debc29;hpb=82b1f76754f039e4ee151c7da7c49819c7310546

diff --git a/src/files.c b/src/files.c
index c3cb4b8d..fc7d7a94 100644
--- a/src/files.c
+++ b/src/files.c
@@ -19,6 +19,92 @@
 #include "tape.h"
 #include "joystick.h"
 
+#define MAX_LINE_LEN			1000
+
+static char *getGlobalDataDir()
+{
+  return GAME_DIR;
+}
+
+static char *getUserDataDir()
+{
+  static char *userdata_dir = NULL;
+
+  if (!userdata_dir)
+  {
+    char *home_dir = getHomeDir();
+    char *data_dir = USERDATA_DIRECTORY;
+
+    userdata_dir = checked_malloc(strlen(home_dir) + strlen(data_dir) + 2);
+    sprintf(userdata_dir, "%s/%s", home_dir, data_dir);
+  }
+
+  return userdata_dir;
+}
+
+static char *getSetupDir()
+{
+  return getUserDataDir();
+}
+
+static char *getTapeDir(char *level_subdir)
+{
+  static char *tape_dir = NULL;
+  char *data_dir = getUserDataDir();
+  char *tape_subdir = TAPES_DIRECTORY;
+
+  if (tape_dir)
+    free(tape_dir);
+
+  tape_dir = checked_malloc(strlen(data_dir) + strlen(tape_subdir) +
+			    strlen(level_subdir) + 3);
+  sprintf(tape_dir, "%s/%s%s%s", data_dir, tape_subdir,
+	  (strlen(level_subdir) > 0 ? "/" : ""), level_subdir);
+
+  return tape_dir;
+}
+
+static char *getScoreDir(char *level_subdir)
+{
+  static char *score_dir = NULL;
+  char *data_dir = getGlobalDataDir();
+  char *score_subdir = SCORES_DIRECTORY;
+
+  if (score_dir)
+    free(score_dir);
+
+  score_dir = checked_malloc(strlen(data_dir) + strlen(score_subdir) +
+			     strlen(level_subdir) + 3);
+  sprintf(score_dir, "%s/%s%s%s", data_dir, score_subdir,
+	  (strlen(level_subdir) > 0 ? "/" : ""), level_subdir);
+
+  return score_dir;
+}
+
+static void createDirectory(char *dir, char *text)
+{
+  if (access(dir, F_OK) != 0)
+    if (mkdir(dir, USERDATA_DIR_MODE) != 0)
+      Error(ERR_WARN, "cannot create %s directory '%s'", text, dir);
+}
+
+static void InitUserDataDirectory()
+{
+  createDirectory(getUserDataDir(), "user data");
+}
+
+static void InitTapeDirectory(char *level_subdir)
+{
+  createDirectory(getTapeDir(""), "main tape");
+  createDirectory(getTapeDir(level_subdir), "level tape");
+}
+
+static void InitScoreDirectory(char *level_subdir)
+{
+  createDirectory(getScoreDir(""), "main score");
+  createDirectory(getScoreDir(level_subdir), "level score");
+}
+
 boolean LoadLevelInfo()
 {
   int i;
@@ -26,16 +112,16 @@ boolean LoadLevelInfo()
   char cookie[MAX_FILENAME_LEN];
   FILE *file;
 
-  sprintf(filename,"%s/%s",level_directory,LEVDIR_FILENAME);
+  sprintf(filename, "%s/%s", options.level_directory, LEVDIR_FILENAME);
 
-  if (!(file=fopen(filename,"r")))
+  if (!(file = fopen(filename, "r")))
   {
     Error(ERR_WARN, "cannot read level info '%s'", filename);
     return(FALSE);
   }
 
-  fscanf(file,"%s\n",cookie);
-  if (strcmp(cookie,LEVELDIR_COOKIE))	/* ungültiges Format? */
+  fscanf(file, "%s\n", cookie);
+  if (strcmp(cookie, LEVELDIR_COOKIE))
   {
     Error(ERR_WARN, "wrong format of level info file");
     fclose(file);
@@ -44,12 +130,12 @@ boolean LoadLevelInfo()
 
   num_leveldirs = 0;
   leveldir_nr = 0;
-  for(i=0;i<MAX_LEVDIR_ENTRIES;i++)
+  for(i=0; i<MAX_LEVDIR_ENTRIES; i++)
   {
-    fscanf(file,"%s",leveldir[i].filename);
-    fscanf(file,"%s",leveldir[i].name);
-    fscanf(file,"%d",&leveldir[i].levels);
-    fscanf(file,"%d",&leveldir[i].readonly);
+    fscanf(file, "%s", leveldir[i].filename);
+    fscanf(file, "%s", leveldir[i].name);
+    fscanf(file, "%d", &leveldir[i].levels);
+    fscanf(file, "%d", &leveldir[i].readonly);
     if (feof(file))
       break;
 
@@ -67,22 +153,22 @@ boolean LoadLevelInfo()
 
 void LoadLevel(int level_nr)
 {
-  int i,x,y;
+  int i, x, y;
   char filename[MAX_FILENAME_LEN];
   char cookie[MAX_FILENAME_LEN];
   FILE *file;
 
-  sprintf(filename,"%s/%s/%d",
-	  level_directory,leveldir[leveldir_nr].filename,level_nr);
+  sprintf(filename, "%s/%s/%d",
+	  options.level_directory, leveldir[leveldir_nr].filename, level_nr);
 
-  if (!(file = fopen(filename,"r")))
+  if (!(file = fopen(filename, "r")))
     Error(ERR_WARN, "cannot read level '%s' - creating new level", filename);
   else
   {
-    fgets(cookie,LEVEL_COOKIE_LEN,file);
+    fgets(cookie, LEVEL_COOKIE_LEN, file);
     fgetc(file);
 
-    if (strcmp(cookie,LEVEL_COOKIE))	/* ungültiges Format? */
+    if (strcmp(cookie,LEVEL_COOKIE))
     {
       Error(ERR_WARN, "wrong format of level file '%s'", filename);
       fclose(file);
@@ -97,34 +183,34 @@ void LoadLevel(int level_nr)
 
     level.time		= (fgetc(file)<<8) | fgetc(file);
     level.edelsteine	= (fgetc(file)<<8) | fgetc(file);
-    for(i=0;i<MAX_LEVNAMLEN;i++)
+    for(i=0; i<MAX_LEVNAMLEN; i++)
       level.name[i]	= fgetc(file);
     level.name[MAX_LEVNAMLEN-1] = 0;
-    for(i=0;i<MAX_LEVSCORE_ENTRIES;i++)
+    for(i=0; i<MAX_LEVSCORE_ENTRIES; i++)
       level.score[i]	= fgetc(file);
-    for(i=0;i<4;i++)
-      for(y=0;y<3;y++)
-	for(x=0;x<3;x++)
+    for(i=0; i<4; i++)
+      for(y=0; y<3; y++)
+	for(x=0; x<3; x++)
 	  level.mampfer_inhalt[i][x][y] = fgetc(file);
     level.tempo_amoebe	= fgetc(file);
     level.dauer_sieb	= fgetc(file);
     level.dauer_ablenk	= fgetc(file);
     level.amoebe_inhalt = fgetc(file);
 
-    for(i=0;i<NUM_FREE_LVHD_BYTES;i++)	/* Rest frei / Headergröße 80 Bytes */
+    for(i=0; i<NUM_FREE_LVHD_BYTES; i++) /* Rest frei / Headergröße 80 Bytes */
       fgetc(file);
 
-    for(y=0;y<MAX_LEV_FIELDY;y++) 
-      for(x=0;x<MAX_LEV_FIELDX;x++) 
+    for(y=0; y<MAX_LEV_FIELDY; y++) 
+      for(x=0; x<MAX_LEV_FIELDX; x++) 
 	Feld[x][y] = Ur[x][y] = EL_ERDREICH;
 
-    for(y=0;y<lev_fieldy;y++) 
-      for(x=0;x<lev_fieldx;x++) 
+    for(y=0; y<lev_fieldy; y++) 
+      for(x=0; x<lev_fieldx; x++) 
 	Feld[x][y] = Ur[x][y] = fgetc(file);
 
     fclose(file);
 
-    if (level.time<=10)	/* Mindestspieldauer */
+    if (level.time <= 10)	/* Mindestspieldauer */
       level.time = 10;
   }
   else
@@ -134,20 +220,20 @@ void LoadLevel(int level_nr)
 
     level.time		= 100;
     level.edelsteine	= 0;
-    strncpy(level.name,"Nameless Level",MAX_LEVNAMLEN-1);
-    for(i=0;i<MAX_LEVSCORE_ENTRIES;i++)
+    strcpy(level.name, "Nameless Level");
+    for(i=0; i<MAX_LEVSCORE_ENTRIES; i++)
       level.score[i]	= 10;
-    for(i=0;i<4;i++)
-      for(y=0;y<3;y++)
-	for(x=0;x<3;x++)
+    for(i=0; i<4; i++)
+      for(y=0; y<3; y++)
+	for(x=0; x<3; x++)
 	  level.mampfer_inhalt[i][x][y] = EL_FELSBROCKEN;
     level.tempo_amoebe	= 10;
     level.dauer_sieb	= 10;
     level.dauer_ablenk	= 10;
     level.amoebe_inhalt = EL_DIAMANT;
 
-    for(y=0;y<STD_LEV_FIELDY;y++) 
-      for(x=0;x<STD_LEV_FIELDX;x++) 
+    for(y=0; y<STD_LEV_FIELDY; y++) 
+      for(x=0; x<STD_LEV_FIELDX; x++) 
 	Feld[x][y] = Ur[x][y] = EL_ERDREICH;
     Feld[0][0] = Ur[0][0] = EL_SPIELFIGUR;
     Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
@@ -157,55 +243,55 @@ void LoadLevel(int level_nr)
 
 void SaveLevel(int level_nr)
 {
-  int i,x,y;
+  int i, x, y;
   char filename[MAX_FILENAME_LEN];
   FILE *file;
 
-  sprintf(filename,"%s/%s/%d",
-	  level_directory,leveldir[leveldir_nr].filename,level_nr);
+  sprintf(filename, "%s/%s/%d",
+	  options.level_directory, leveldir[leveldir_nr].filename, level_nr);
 
-  if (!(file=fopen(filename,"w")))
+  if (!(file = fopen(filename, "w")))
   {
     Error(ERR_WARN, "cannot save level file '%s'", filename);
     return;
   }
 
   fputs(LEVEL_COOKIE,file);		/* Formatkennung */
-  fputc(0x0a,file);
-
-  fputc(level.fieldx,file);
-  fputc(level.fieldy,file);
-  fputc(level.time / 256,file);
-  fputc(level.time % 256,file);
-  fputc(level.edelsteine / 256,file);
-  fputc(level.edelsteine % 256,file);
-
-  for(i=0;i<MAX_LEVNAMLEN;i++)
-    fputc(level.name[i],file);
-  for(i=0;i<MAX_LEVSCORE_ENTRIES;i++)
-    fputc(level.score[i],file);
-  for(i=0;i<4;i++)
-    for(y=0;y<3;y++)
-      for(x=0;x<3;x++)
-	fputc(level.mampfer_inhalt[i][x][y],file);
-  fputc(level.tempo_amoebe,file);
-  fputc(level.dauer_sieb,file);
-  fputc(level.dauer_ablenk,file);
-  fputc(level.amoebe_inhalt,file);
-
-  for(i=0;i<NUM_FREE_LVHD_BYTES;i++)	/* Rest frei / Headergröße 80 Bytes */
-    fputc(0,file);
-
-  for(y=0;y<lev_fieldy;y++) 
-    for(x=0;x<lev_fieldx;x++) 
-      fputc(Ur[x][y],file);
+  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)
+void LoadTape(int level_nr)
 {
   int i;
   char filename[MAX_FILENAME_LEN];
@@ -213,21 +299,17 @@ void LoadLevelTape(int level_nr)
   FILE *file;
   boolean levelrec_10 = FALSE;
 
-#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
+  sprintf(filename, "%s/%d.%s",
+	  getTapeDir(leveldir[leveldir_nr].filename),
+	  level_nr, TAPEFILE_EXTENSION);
 
-  if ((file=fopen(filename,"r")))
+  if ((file = fopen(filename, "r")))
   {
-    fgets(cookie,LEVELREC_COOKIE_LEN,file);
+    fgets(cookie, LEVELREC_COOKIE_LEN, file);
     fgetc(file);
-    if (!strcmp(cookie,LEVELREC_COOKIE_10))	/* old 1.0 tape format */
+    if (!strcmp(cookie, LEVELREC_COOKIE_10))	/* old 1.0 tape format */
       levelrec_10 = TRUE;
-    else if (strcmp(cookie,LEVELREC_COOKIE))	/* unknown tape format */
+    else if (strcmp(cookie, LEVELREC_COOKIE))	/* unknown tape format */
     {
       Error(ERR_WARN, "wrong format of level recording file '%s'", filename);
       fclose(file);
@@ -253,7 +335,7 @@ void LoadLevelTape(int level_nr)
   tape.playing = FALSE;
   tape.pausing = FALSE;
 
-  for(i=0;i<tape.length;i++)
+  for(i=0; i<tape.length; i++)
   {
     int j;
 
@@ -262,7 +344,7 @@ void LoadLevelTape(int level_nr)
 
     for(j=0; j<MAX_PLAYERS; j++)
     {
-      if (levelrec_10 && j>0)
+      if (levelrec_10 && j > 0)
       {
 	tape.pos[i].action[j] = MV_NO_MOVING;
 	continue;
@@ -272,6 +354,34 @@ void LoadLevelTape(int level_nr)
 
     tape.pos[i].delay = fgetc(file);
 
+    if (levelrec_10)
+    {
+      /* eliminate possible diagonal moves in old tapes */
+      /* this is only for backward compatibility */
+
+      byte joy_dir[4] = { JOY_LEFT, JOY_RIGHT, JOY_UP, JOY_DOWN };
+      byte action = tape.pos[i].action[0];
+      int k, num_moves = 0;
+
+      for (k=0; k<4; k++)
+      {
+	if (action & joy_dir[k])
+	{
+	  tape.pos[i + num_moves].action[0] = joy_dir[k];
+	  if (num_moves > 0)
+	    tape.pos[i + num_moves].delay = 0;
+	  num_moves++;
+	}
+      }
+
+      if (num_moves > 1)
+      {
+	num_moves--;
+	i += num_moves;
+	tape.length += num_moves;
+      }
+    }
+
     if (feof(file))
       break;
   }
@@ -284,39 +394,37 @@ void LoadLevelTape(int level_nr)
   tape.length_seconds = GetTapeLength();
 }
 
-void SaveLevelTape(int level_nr)
+void SaveTape(int level_nr)
 {
   int i;
   char filename[MAX_FILENAME_LEN];
   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
+  sprintf(filename, "%s/%d.%s",
+	  getTapeDir(leveldir[leveldir_nr].filename),
+	  level_nr, TAPEFILE_EXTENSION);
+
+  InitTapeDirectory(leveldir[leveldir_nr].filename);
 
   /* Testen, ob bereits eine Aufnahme existiert */
-  if ((file=fopen(filename,"r")))
+  if ((file = fopen(filename, "r")))
   {
     new_tape = FALSE;
     fclose(file);
 
-    if (!Request("Replace old tape ?",REQ_ASK))
+    if (!Request("Replace old tape ?", REQ_ASK))
       return;
   }
 
-  if (!(file=fopen(filename,"w")))
+  if (!(file = fopen(filename, "w")))
   {
     Error(ERR_WARN, "cannot save level recording file '%s'", filename);
     return;
   }
 
-  fputs(LEVELREC_COOKIE,file);		/* Formatkennung */
-  fputc(0x0a,file);
+  fputs(LEVELREC_COOKIE, file);		/* Formatkennung */
+  fputc(0x0a, file);
 
   fputc((tape.random_seed >> 24) & 0xff,file);
   fputc((tape.random_seed >> 16) & 0xff,file);
@@ -333,14 +441,14 @@ void SaveLevelTape(int level_nr)
   fputc((tape.length >>   8) & 0xff,file);
   fputc((tape.length >>   0) & 0xff,file);
 
-  for(i=0;i<tape.length;i++)
+  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].action[j], file);
 
-    fputc(tape.pos[i].delay,file);
+    fputc(tape.pos[i].delay, file);
   }
 
   fclose(file);
@@ -353,264 +461,182 @@ void SaveLevelTape(int level_nr)
     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);
-
-  chmod(filename, SCORE_PERMS);
-  return(TRUE);
-}
-
 void LoadScore(int level_nr)
 {
-  int i,j;
+  int i;
   char filename[MAX_FILENAME_LEN];
   char cookie[MAX_FILENAME_LEN];
+  char line[MAX_LINE_LEN];
+  char *line_ptr;
   FILE *file;
 
-  sprintf(filename,"%s/%s/%s",
-	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
-
-  if (!(file = fopen(filename,"r")))
+  /* start with empty score table */
+  for(i=0; i<MAX_SCORE_ENTRIES; i++)
   {
-    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);
+    strcpy(highscore[i].Name, EMPTY_ALIAS);
+    highscore[i].Score = 0;
   }
 
-  if (file)
-  {
-    fgets(cookie,SCORE_COOKIE_LEN,file);
-    if (strcmp(cookie,SCORE_COOKIE))	/* ungültiges Format? */
-    {
-      Error(ERR_WARN, "wrong format of score file '%s'", filename);
-      fclose(file);
-      file = NULL;
-    }
-  }
-
-  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;
-    }
-  }
-}
+  sprintf(filename, "%s/%d.%s",
+	  getScoreDir(leveldir[leveldir_nr].filename),
+	  level_nr, SCOREFILE_EXTENSION);
 
-void SaveScore(int level_nr)
-{
-  int i,j;
-  char filename[MAX_FILENAME_LEN];
-  FILE *file;
+  if (!(file = fopen(filename, "r")))
+    return;
 
-  sprintf(filename,"%s/%s/%s",
-	  level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
+  fgets(cookie, SCORE_COOKIE_LEN, file);
 
-  if (!(file=fopen(filename,"r+")))
+  if (strcmp(cookie, SCORE_COOKIE) != 0)
   {
-    Error(ERR_WARN, "cannot save score for level %d", level_nr);
+    Error(ERR_WARN, "wrong format of score file '%s'", filename);
+    fclose(file);
     return;
   }
 
-  fseek(file,
-	SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)),
-	SEEK_SET);
-  for(i=0;i<MAX_SCORE_ENTRIES;i++)
+  for(i=0; i<MAX_SCORE_ENTRIES; i++)
   {
-    for(j=0;j<MAX_NAMELEN;j++)
-      fputc(highscore[i].Name[j],file);
-    fputc(highscore[i].Score / 256,file);
-    fputc(highscore[i].Score % 256,file);
-  }
-  fclose(file);
-}
-
-void LoadJoystickData()
-{
-  int i;
-  char cookie[256];
-  FILE *file;
+    int position_nr;
 
-  if (joystick_status==JOYSTICK_OFF)
-    return;
+    fscanf(file, "%d", &position_nr);
+    fscanf(file, "%d", &highscore[i].Score);
+    fgets(line, MAX_LINE_LEN, file);
 
-#ifndef MSDOS
-  if (!(file=fopen(JOYDAT_FILE,"r")))
-    return;
+    if (line[strlen(line)-1] == '\n')
+      line[strlen(line)-1] = '\0';
 
-  fscanf(file,"%s",cookie);
-  if (strcmp(cookie,JOYSTICK_COOKIE))	/* ungültiges Format? */
-  {
-    Error(ERR_WARN, "wrong format of joystick file '%s'", JOYDAT_FILE);
-    fclose(file);
-    return;
+    for (line_ptr = line; *line_ptr; line_ptr++)
+    {
+      if (*line_ptr != ' ' && *line_ptr != '\t' && *line_ptr != '\0')
+      {
+	strncpy(highscore[i].Name, line_ptr, MAX_NAMELEN - 1);
+	highscore[i].Name[MAX_NAMELEN - 1] = '\0';
+	break;
+      }
+    }
   }
 
-  for(i=0;i<2;i++)
-  {
-    fscanf(file,"%s",cookie);
-    fscanf(file, "%d %d %d \n",
-	   &joystick[i].xleft, &joystick[i].xmiddle, &joystick[i].xright);
-    fscanf(file, "%d %d %d \n",
-	   &joystick[i].yupper, &joystick[i].ymiddle, &joystick[i].ylower);
-  }
   fclose(file);
-
-  CheckJoystickData();
-#else
-  load_joystick_data(JOYDAT_FILE);
-#endif
 }
 
-void SaveJoystickData()
+void SaveScore(int level_nr)
 {
   int i;
+  char filename[MAX_FILENAME_LEN];
   FILE *file;
 
-  if (joystick_status==JOYSTICK_OFF)
-    return;
+  sprintf(filename, "%s/%d.%s",
+	  getScoreDir(leveldir[leveldir_nr].filename),
+	  level_nr, SCOREFILE_EXTENSION);
 
-#ifndef MSDOS
-  CheckJoystickData();
+  InitScoreDirectory(leveldir[leveldir_nr].filename);
 
-  if (!(file=fopen(JOYDAT_FILE,"w")))
+  if (!(file = fopen(filename, "w")))
   {
-    Error(ERR_WARN, "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++)
-  {
-    fprintf(file,"JOYSTICK_%d_DATA\n",i);
-    fprintf(file, "%d %d %d \n",
-	    joystick[i].xleft, joystick[i].xmiddle, joystick[i].xright);
-    fprintf(file, "%d %d %d \n",
-	    joystick[i].yupper, joystick[i].ymiddle, joystick[i].ylower);
-  }
-  fclose(file);
-
-  chmod(JOYDAT_FILE, JOYDAT_PERMS);
-#else
-  save_joystick_data(JOYDAT_FILE);
-#endif
+  fprintf(file, "%s\n\n", SCORE_COOKIE);
 
-}
+  for(i=0; i<MAX_SCORE_ENTRIES; i++)
+    fprintf(file, "%d %d %s\n", i+1, highscore[i].Score, highscore[i].Name);
 
-/* ------------------------------------------------------------------------- */
-/* new setup functions                                                       */
-/* ------------------------------------------------------------------------- */
+  fclose(file);
 
-#define MAX_LINE_LEN			1000
-#define MAX_SETUP_TOKEN_LEN		100
-#define MAX_SETUP_VALUE_LEN		100
+  chmod(filename, SCORE_PERMS);
+}
 
 #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 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_TEAM_MODE		11
+#define SETUP_TOKEN_ALIAS_NAME		12
+
+#define SETUP_TOKEN_USE_JOYSTICK	13
+#define SETUP_TOKEN_JOY_DEVICE_NAME	14
+#define SETUP_TOKEN_JOY_XLEFT		15
+#define SETUP_TOKEN_JOY_XMIDDLE		16
+#define SETUP_TOKEN_JOY_XRIGHT		17
+#define SETUP_TOKEN_JOY_YUPPER		18
+#define SETUP_TOKEN_JOY_YMIDDLE		19
+#define SETUP_TOKEN_JOY_YLOWER		20
+#define SETUP_TOKEN_JOY_SNAP		21
+#define SETUP_TOKEN_JOY_BOMB		22
+#define SETUP_TOKEN_KEY_LEFT		23
+#define SETUP_TOKEN_KEY_RIGHT		24
+#define SETUP_TOKEN_KEY_UP		25
+#define SETUP_TOKEN_KEY_DOWN		26
+#define SETUP_TOKEN_KEY_SNAP		27
+#define SETUP_TOKEN_KEY_BOMB		28
+
+#define NUM_SETUP_TOKENS		29
+
+#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_SWITCH,  &si.team_mode,	"team_mode"			},
+  { 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)
@@ -655,7 +681,7 @@ static int get_string_integer_value(char *s)
       if (strcmp(string_tolower(s), number_text[i][j]) == 0)
 	return i;
 
-  return -1;
+  return atoi(s);
 }
 
 static boolean get_string_boolean_value(char *s)
@@ -669,19 +695,6 @@ static boolean get_string_boolean_value(char *s)
     return FALSE;
 }
 
-static char *getSetupToken(int token_nr)
-{
-  return setup_info[token_nr].token;
-}
-
-static char *getSetupValue(int token_nr, boolean token_value)
-{
-  if (token_value == TRUE)
-    return setup_info[token_nr].value_true;
-  else
-    return setup_info[token_nr].value_false;
-}
-
 static char *getFormattedSetupEntry(char *token, char *value)
 {
   int i;
@@ -697,48 +710,6 @@ static char *getFormattedSetupEntry(char *token, char *value)
   return entry;
 }
 
-static char *getSetupEntry(char *prefix, int token_nr, int token_value)
-{
-  int i;
-  static char entry[MAX_LINE_LEN];
-
-  sprintf(entry, "%s%s:", prefix, getSetupToken(token_nr));
-  for (i=strlen(entry); i<TOKEN_VALUE_POSITION; i++)
-    entry[i] = ' ';
-  entry[i] = '\0';
-
-  strcat(entry, getSetupValue(token_nr, token_value));
-
-  return entry;
-}
-
-static char *getSetupEntryWithComment(char *prefix,int token_nr, KeySym keysym)
-{
-  int i;
-  static char entry[MAX_LINE_LEN];
-  char *keyname = getKeyNameFromKeySym(keysym);
-
-  sprintf(entry, "%s%s:", prefix, getSetupToken(token_nr));
-  for (i=strlen(entry); i<TOKEN_VALUE_POSITION; i++)
-    entry[i] = ' ';
-  entry[i] = '\0';
-
-  strcat(entry, getX11KeyNameFromKeySym(keysym));
-  for (i=strlen(entry); i<50; i++)
-    entry[i] = ' ';
-  entry[i] = '\0';
-
-  /* add comment, if useful */
-  if (strcmp(keyname, "(undefined)") != 0 &&
-      strcmp(keyname, "(unknown)") != 0)
-  {
-    strcat(entry, "# ");
-    strcat(entry, keyname);
-  }
-
-  return entry;
-}
-
 static void freeSetupFileList(struct SetupFileList *setup_file_list)
 {
   if (!setup_file_list)
@@ -768,8 +739,8 @@ static struct SetupFileList *newSetupFileList(char *token, char *value)
   return new;
 }
 
-static char *getSetupFileListEntry(struct SetupFileList *setup_file_list,
-				   char *token)
+static char *getTokenValue(struct SetupFileList *setup_file_list,
+			   char *token)
 {
   if (!setup_file_list)
     return NULL;
@@ -777,44 +748,25 @@ static char *getSetupFileListEntry(struct SetupFileList *setup_file_list,
   if (strcmp(setup_file_list->token, token) == 0)
     return setup_file_list->value;
   else
-    return getSetupFileListEntry(setup_file_list->next, token);
+    return getTokenValue(setup_file_list->next, token);
 }
 
-boolean setSetupFileListEntry(struct SetupFileList *setup_file_list,
-			      char *token, char *value)
+static void setTokenValue(struct SetupFileList *setup_file_list,
+			  char *token, char *value)
 {
   if (!setup_file_list)
-    return FALSE;
+    return;
 
   if (strcmp(setup_file_list->token, token) == 0)
   {
     free(setup_file_list->value);
     setup_file_list->value = checked_malloc(strlen(value) + 1);
     strcpy(setup_file_list->value, value);
-
-    return TRUE;
   }
+  else if (setup_file_list->next == NULL)
+    setup_file_list->next = newSetupFileList(token, value);
   else
-    return setSetupFileListEntry(setup_file_list->next, token, value);
-}
-
-void updateSetupFileListEntry(struct SetupFileList *setup_file_list,
-			      char *token, char *value)
-{
-  if (!setup_file_list)
-    return;
-
-  if (getSetupFileListEntry(setup_file_list, token) != NULL)
-    setSetupFileListEntry(setup_file_list, token, value);
-  else
-  {
-    struct SetupFileList *list_entry = setup_file_list;
-
-    while (list_entry->next)
-      list_entry = list_entry->next;
-
-    list_entry->next = newSetupFileList(token, value);
-  }
+    setTokenValue(setup_file_list->next, token, value);
 }
 
 #ifdef DEBUG
@@ -838,13 +790,6 @@ static struct SetupFileList *loadSetupFileList(char *filename)
   struct SetupFileList *setup_file_list = newSetupFileList("", "");
   struct SetupFileList *first_valid_list_entry;
 
-
-
-  /*
-  struct SetupFileList **next_entry = &setup_file_list;
-  */
-
-
   FILE *file;
 
   if (!(file = fopen(filename, "r")))
@@ -906,20 +851,7 @@ static struct SetupFileList *loadSetupFileList(char *filename)
 	break;
 
     if (*token && *value)
-      updateSetupFileListEntry(setup_file_list, token, value);
-
-
-#if 0
-    {
-      /* allocate new token/value pair */
-
-      *next_entry = newSetupFileList(token, value);
-      next_entry = &((*next_entry)->next);
-    }
-#endif
-
-
-
+      setTokenValue(setup_file_list, token, value);
   }
 
   fclose(file);
@@ -962,266 +894,251 @@ static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
   }
 }
 
-static void decodeSetupFileList(struct SetupFileList *setup_file_list)
+static void setSetupInfoToDefaults(struct SetupInfo *si)
 {
   int i;
-  int token_nr = TOKEN_INVALID;
-  int player_nr = 0;
-  char *token;
-  char *token_value;
-  int token_integer_value;
-  boolean token_boolean_value;
-  int token_player_prefix_len;
-
-  if (!setup_file_list)
-    return;
-
-  token = setup_file_list->token;
-  token_value = setup_file_list->value;
-  token_integer_value = get_string_integer_value(token_value);
-  token_boolean_value = get_string_boolean_value(token_value);
 
-  token_player_prefix_len = strlen(TOKEN_STR_PLAYER_PREFIX);
+  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';
 
-  if (strncmp(token, TOKEN_STR_PLAYER_PREFIX,
-	      token_player_prefix_len) == 0)
+  for (i=0; i<MAX_PLAYERS; i++)
   {
-    token += token_player_prefix_len;
-
-    if (*token >= '0' && *token <= '9')
-    {
-      player_nr = ((int)(*token - '0') - 1 + MAX_PLAYERS) % MAX_PLAYERS;
-      token++;
-    }
+    si->input[i].use_joystick = FALSE;
+    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);
   }
+}
 
-  for (i=0; i<NUM_SETUP_TOKENS; i++)
-  {
-    if (strcmp(token, setup_info[i].token) == 0)
-    {
-      token_nr = i;
-      break;
-    }
-  }
+static void setSetupInfo(int token_nr, char *token_value)
+{
+  int token_type = token_info[token_nr].type;
+  void *setup_value = token_info[token_nr].value;
 
-  if (strcmp(token, TOKEN_STR_FILE_IDENTIFIER) == 0)
-    token_nr = TOKEN_IGNORE;
-  else if (strcmp(token, TOKEN_STR_ALIAS_NAME) == 0)
-    token_nr = SETUP_TOKEN_ALIAS_NAME;
+  if (token_value == NULL)
+    return;
 
-  switch (token_nr)
+  /* set setup field to corresponding token value */
+  switch (token_type)
   {
-    case SETUP_TOKEN_SOUND:
-      setup.sound_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SOUND_LOOPS:
-      setup.sound_loops_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SOUND_MUSIC:
-      setup.sound_music_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SOUND_SIMPLE:
-      setup.sound_simple_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_TOONS:
-      setup.toons_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_DIRECT_DRAW:
-      setup.direct_draw_on = !token_boolean_value;
-      break;
-    case SETUP_TOKEN_SCROLL_DELAY:
-      setup.scroll_delay_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_SOFT_SCROLLING:
-      setup.soft_scrolling_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_FADING:
-      setup.fading_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_AUTORECORD:
-      setup.autorecord_on = token_boolean_value;
-      break;
-    case SETUP_TOKEN_QUICK_DOORS:
-      setup.quick_doors = token_boolean_value;
+    case TYPE_BOOLEAN:
+    case TYPE_SWITCH:
+      *(boolean *)setup_value = get_string_boolean_value(token_value);
       break;
 
-    case SETUP_TOKEN_USE_JOYSTICK:
-      setup.input[player_nr].use_joystick = token_boolean_value;
-      break;
-    case SETUP_TOKEN_JOYSTICK_NR:
-      if (token_integer_value < 0 || token_integer_value > 1)
-	token_integer_value = 1;
-      setup.input[player_nr].joystick_nr = token_integer_value - 1;
-      break;
-    case SETUP_TOKEN_JOY_SNAP:
-      setup.input[player_nr].joy.snap = getJoySymbolFromJoyName(token_value);
-      break;
-    case SETUP_TOKEN_JOY_BOMB    :
-      setup.input[player_nr].joy.bomb = getJoySymbolFromJoyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_LEFT:
-      setup.input[player_nr].key.left = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_RIGHT:
-      setup.input[player_nr].key.right = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_UP:
-      setup.input[player_nr].key.up = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_DOWN:
-      setup.input[player_nr].key.down = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_SNAP:
-      setup.input[player_nr].key.snap = getKeySymFromX11KeyName(token_value);
-      break;
-    case SETUP_TOKEN_KEY_BOMB:
-      setup.input[player_nr].key.bomb = getKeySymFromX11KeyName(token_value);
+    case TYPE_KEYSYM:
+      *(KeySym *)setup_value = getKeySymFromX11KeyName(token_value);
       break;
 
-    case SETUP_TOKEN_ALIAS_NAME:
-      strncpy(local_player->alias_name, token_value, MAX_NAMELEN-1);
-      local_player->alias_name[MAX_NAMELEN-1] = '\0';
+    case TYPE_INTEGER:
+      *(int *)setup_value = get_string_integer_value(token_value);
       break;
 
-    case TOKEN_INVALID:
-      Error(ERR_WARN, "unknown token '%s' not recognized", token);
+    case TYPE_STRING:
+      strcpy((char *)setup_value, token_value);
       break;
 
-    case TOKEN_IGNORE:
     default:
       break;
   }
+}
+
+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);
 
-  decodeSetupFileList(setup_file_list->next);
+    sii = setup.input[pnr];
+    for (i=FIRST_PLAYER_SETUP_TOKEN; i<=LAST_PLAYER_SETUP_TOKEN; i++)
+    {
+      char full_token[100];
+
+      sprintf(full_token, "%s%s", prefix, token_info[i].text);
+      setSetupInfo(i, getTokenValue(setup_file_list, full_token));
+    }
+    setup.input[pnr] = sii;
+  }
 }
 
-void LoadSetup()
+int getLevelSeriesNrFromLevelSeriesName(char *level_series_name)
 {
   int i;
-  char filename[MAX_FILENAME_LEN];
-  struct SetupFileList *setup_file_list = NULL;
 
-  /* always start with reliable default setup values */
+  if (!level_series_name)
+    return 0;
 
-  strncpy(local_player->login_name, GetLoginName(), MAX_NAMELEN-1);
-  local_player->login_name[MAX_NAMELEN-1] = '\0';
+  for (i=0; i<num_leveldirs; i++)
+    if (strcmp(level_series_name, leveldir[i].filename) == 0)
+      return i;
 
-  strncpy(local_player->alias_name, GetLoginName(), MAX_NAMELEN-1);
-  local_player->alias_name[MAX_NAMELEN-1] = '\0';
+  return 0;
+}
 
-  setup.sound_on = TRUE;
-  setup.sound_loops_on = FALSE;
-  setup.sound_music_on = FALSE;
-  setup.sound_simple_on = FALSE;
-  setup.toons_on = TRUE;
-  setup.direct_draw_on = FALSE;
-  setup.scroll_delay_on = FALSE;
-  setup.soft_scrolling_on = TRUE;
-  setup.fading_on = FALSE;
-  setup.autorecord_on = FALSE;
-  setup.quick_doors = FALSE;
+int getLastPlayedLevelOfLevelSeries(char *level_series_name)
+{
+  char *token_value;
+  int level_series_nr = getLevelSeriesNrFromLevelSeriesName(level_series_name);
+  int last_level_nr = 0;
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  if (!level_series_name)
+    return 0;
+
+  token_value = getTokenValue(level_setup_list, level_series_name);
+
+  if (token_value)
   {
-    setup.input[i].use_joystick = FALSE;
-    setup.input[i].joystick_nr = 0;
-    setup.input[i].joy.snap  = (i == 0 ? JOY_BUTTON_1 : 0);
-    setup.input[i].joy.bomb  = (i == 0 ? JOY_BUTTON_2 : 0);
-    setup.input[i].key.left  = (i == 0 ? DEFAULT_KEY_LEFT  : KEY_UNDEFINDED);
-    setup.input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KEY_UNDEFINDED);
-    setup.input[i].key.up    = (i == 0 ? DEFAULT_KEY_UP    : KEY_UNDEFINDED);
-    setup.input[i].key.down  = (i == 0 ? DEFAULT_KEY_DOWN  : KEY_UNDEFINDED);
-    setup.input[i].key.snap  = (i == 0 ? DEFAULT_KEY_SNAP  : KEY_UNDEFINDED);
-    setup.input[i].key.bomb  = (i == 0 ? DEFAULT_KEY_BOMB  : KEY_UNDEFINDED);
+    int 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;
   }
 
-  sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
+  return last_level_nr;
+}
+
+void LoadSetup()
+{
+  char filename[MAX_FILENAME_LEN];
+  struct SetupFileList *setup_file_list = NULL;
+
+  /* always start with reliable default setup values */
+  setSetupInfoToDefaults(&setup);
+
+  sprintf(filename, "%s/%s", getSetupDir(), 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
-    Error(ERR_RETURN, "using default setup values");
+    Error(ERR_WARN, "using default setup values");
 }
 
-void LoadLevelSetup()
+static char *getSetupLine(char *prefix, int token_nr)
 {
-  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);
+  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;
 
-  level_setup_list = loadSetupFileList(filename);
+  /* 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, " ");
 
-  if (level_setup_list)
+  /* continue with the token's value (which can have different types) */
+  switch (token_type)
   {
-    int i;
+    case TYPE_BOOLEAN:
+      strcat(entry, (*(boolean *)setup_value ? "true" : "false"));
+      break;
 
-    char *last_level_series =
-      getSetupFileListEntry(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES);
+    case TYPE_SWITCH:
+      strcat(entry, (*(boolean *)setup_value ? "on" : "off"));
+      break;
 
-    if (last_level_series)
-    {
-      for (i=0; i<num_leveldirs; i++)
+    case TYPE_KEYSYM:
       {
-	if (strcmp(last_level_series, leveldir[i].filename) == 0)
-	{
-	  char *token_value =
-	    getSetupFileListEntry(level_setup_list, last_level_series);
+	KeySym keysym = *(KeySym *)setup_value;
+	char *keyname = getKeyNameFromKeySym(keysym);
 
-	  leveldir_nr = i;
+	strcat(entry, getX11KeyNameFromKeySym(keysym));
+	for (i=strlen(entry); i<50; i++)
+	  strcat(entry, " ");
 
-	  if (token_value)
-	  {
-	    level_nr = atoi(token_value);
-
-	    if (level_nr < 0)
-	      level_nr = 0;
-	    if (level_nr > leveldir[leveldir_nr].levels - 1)
-	      level_nr = leveldir[leveldir_nr].levels - 1;
-	  }
-
-	  break;
+	/* add comment, if useful */
+	if (strcmp(keyname, "(undefined)") != 0 &&
+	    strcmp(keyname, "(unknown)") != 0)
+	{
+	  strcat(entry, "# ");
+	  strcat(entry, keyname);
 	}
       }
-    }
+      break;
 
+    case TYPE_INTEGER:
+      {
+	char buffer[MAX_LINE_LEN];
 
-#if 0
-    printSetupFileList(level_setup_list);
-#endif
+	sprintf(buffer, "%d", *(int *)setup_value);
+	strcat(entry, buffer);
+      }
+      break;
 
-    checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
+    case TYPE_STRING:
+      strcat(entry, (char *)setup_value);
+      break;
+
+    default:
+      break;
   }
-  else
-    Error(ERR_RETURN, "using default setup values");
+
+  return entry;
 }
 
 void SaveSetup()
 {
-  int i;
+  int i, pnr;
   char filename[MAX_FILENAME_LEN];
   FILE *file;
 
-  sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME);
+  sprintf(filename, "%s/%s", getSetupDir(), SETUP_FILENAME);
+
+  InitUserDataDirectory();
 
   if (!(file = fopen(filename, "w")))
   {
@@ -1229,91 +1146,32 @@ void SaveSetup()
     return;
   }
 
-  fprintf(file, "%s:              %s\n",
-	  TOKEN_STR_FILE_IDENTIFIER, SETUP_COOKIE);
-
-  fprintf(file, "\n");
-
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_SOUND,
-			setup.sound_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_SOUND_LOOPS,
-			setup.sound_loops_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_SOUND_MUSIC,
-			setup.sound_music_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_SOUND_SIMPLE,
-			setup.sound_simple_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_TOONS,
-			setup.toons_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_DIRECT_DRAW,
-			setup.direct_draw_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_SCROLL_DELAY,
-			setup.scroll_delay_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_SOFT_SCROLLING,
-			setup.soft_scrolling_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_FADING,
-			setup.fading_on));
-  fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_AUTORECORD,
-			setup.autorecord_on));
   fprintf(file, "%s\n",
-	  getSetupEntry("", SETUP_TOKEN_QUICK_DOORS,
-			setup.quick_doors));
-
+	  getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, SETUP_COOKIE));
   fprintf(file, "\n");
 
-  fprintf(file, "%s\n",
-	  getFormattedSetupEntry(TOKEN_STR_ALIAS_NAME,
-				 local_player->alias_name));
+  /* handle global setup values */
+  si = setup;
+  for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++)
+  {
+    /* 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", TOKEN_STR_PLAYER_PREFIX, i + 1);
-
+    sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, pnr + 1);
     fprintf(file, "\n");
 
-    fprintf(file, "%s\n",
-	    getSetupEntry(prefix, SETUP_TOKEN_USE_JOYSTICK,
-			  setup.input[i].use_joystick));
-    fprintf(file, "%s\n",
-	    getSetupEntry(prefix, SETUP_TOKEN_JOYSTICK_NR,
-			  setup.input[i].joystick_nr));
-
-    fprintf(file, "%s%s:      %s\n", prefix,
-	    getSetupToken(SETUP_TOKEN_JOY_SNAP),
-	    getJoyNameFromJoySymbol(setup.input[i].joy.snap));
-    fprintf(file, "%s%s:      %s\n", prefix,
-	    getSetupToken(SETUP_TOKEN_JOY_BOMB),
-	    getJoyNameFromJoySymbol(setup.input[i].joy.bomb));
-
-    fprintf(file, "%s\n",
-	    getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_LEFT,
-				     setup.input[i].key.left));
-    fprintf(file, "%s\n",
-	    getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_RIGHT,
-				     setup.input[i].key.right));
-    fprintf(file, "%s\n",
-	    getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_UP,
-				     setup.input[i].key.up));
-    fprintf(file, "%s\n",
-	    getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_DOWN,
-				     setup.input[i].key.down));
-    fprintf(file, "%s\n",
-	    getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_SNAP,
-				     setup.input[i].key.snap));
-    fprintf(file, "%s\n",
-	    getSetupEntryWithComment(prefix, SETUP_TOKEN_KEY_BOMB,
-				     setup.input[i].key.bomb));
+    sii = setup.input[pnr];
+    for (i=FIRST_PLAYER_SETUP_TOKEN; i<=LAST_PLAYER_SETUP_TOKEN; i++)
+      fprintf(file, "%s\n", getSetupLine(prefix, i));
   }
 
   fclose(file);
@@ -1321,21 +1179,51 @@ void SaveSetup()
   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", getSetupDir(), LEVELSETUP_FILENAME);
+
+  if (level_setup_list)
+    freeSetupFileList(level_setup_list);
+
+  level_setup_list = loadSetupFileList(filename);
+
+  if (level_setup_list)
+  {
+    char *last_level_series =
+      getTokenValue(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES);
+
+    leveldir_nr = getLevelSeriesNrFromLevelSeriesName(last_level_series);
+    level_nr = getLastPlayedLevelOfLevelSeries(last_level_series);
+
+    checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
+  }
+  else
+    Error(ERR_WARN, "using default setup values");
+}
+
 void SaveLevelSetup()
 {
   char filename[MAX_FILENAME_LEN];
   struct SetupFileList *list_entry = level_setup_list;
   FILE *file;
 
-  updateSetupFileListEntry(level_setup_list,
-			   TOKEN_STR_LAST_LEVEL_SERIES,
-			   leveldir[leveldir_nr].filename);
+  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));
 
-  updateSetupFileListEntry(level_setup_list,
-			   leveldir[leveldir_nr].filename,
-			   int2str(level_nr, 0));
+  sprintf(filename, "%s/%s", getSetupDir(), LEVELSETUP_FILENAME);
 
-  sprintf(filename, "%s/%s", SETUP_PATH, LEVELSETUP_FILENAME);
+  InitUserDataDirectory();
 
   if (!(file = fopen(filename, "w")))
   {