rnd-19981029-1
[rocksndiamonds.git] / src / files.c
index 17bc45e5986691d8b773e6ad12dad24c7a29df79..21ed3ca17f8614be3770784740da65e1be5baf7c 100644 (file)
 #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);
-}
-
-
-
-#if 0
-
-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);
-}
-
-#endif
-
-
 boolean LoadLevelInfo()
 {
   int i;
@@ -217,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;
@@ -296,250 +284,6 @@ void LoadLevelTape(int level_nr)
   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_WARN, "cannot create score file '%s'", filename);
-    else if (!(file = fopen(filename,"r"))) 
-      Error(ERR_WARN, "cannot read score for level %d", level_nr);
-  }
-
-  if (file)
-  {
-    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;
-    }
-  }
-}
-
-
-
-#if 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_SETUP)
-    LoadSetup();
-  else if (mode == PLAYER_LEVEL)
-    LoadLevelSetup();
-
-
-
-  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_WARN, "cannot create names file '%s'", filename);
-    else if (!(file = fopen(filename,"r"))) 
-      Error(ERR_WARN, "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_WARN, "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_WARN, "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);
-}
-
-#endif
-
-
-
-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 SaveLevelTape(int level_nr)
 {
   int i;
@@ -609,130 +353,123 @@ 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_WARN, "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);
+}
 
-
-#if 0
-
-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();
-  else if (mode == PLAYER_LEVEL)
-    SaveLevelSetup();
+  sprintf(filename,"%s/%s/%s",
+         level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
 
+  if (!(file = fopen(filename,"r")))
+  {
+    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);
+  }
 
+  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 (mode == PLAYER_LEVEL)
-    sprintf(filename,"%s/%s/%s",
-           level_directory,leveldir[leveldir_nr].filename,NAMES_FILENAME);
+  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
-    sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME);
+  {
+    for(i=0;i<MAX_SCORE_ENTRIES;i++)
+    {
+      strcpy(highscore[i].Name,EMPTY_ALIAS);
+      highscore[i].Score = 0;
+    }
+  }
+}
+
+void SaveScore(int level_nr)
+{
+  int i,j;
+  char filename[MAX_FILENAME_LEN];
+  FILE *file;
 
-  if (!(file = fopen(filename,"r+")))
-  {
-    Error(ERR_WARN, "cannot save player information to file '%s'", filename);
-    return;
-  }
+  sprintf(filename,"%s/%s/%s",
+         level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME);
 
-  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_WARN, "wrong format of names file '%s'", filename);
-    fclose(file);
+    Error(ERR_WARN, "cannot save score for level %d", level_nr);
     return;
   }
 
-  while(1)
-  {
-    for(i=0;i<MAX_NAMELEN;i++)
-      default_player.login_name[i] = fgetc(file);
-    for(i=0;i<MAX_NAMELEN;i++)
-      default_player.alias_name[i] = fgetc(file);
-    default_player.handicap = fgetc(file);
-    default_player.setup = (fgetc(file)<<8) | fgetc(file);
-    default_player.leveldir_nr = fgetc(file);
-    if (!version_10_file)
-    {
-      default_player.level_nr = fgetc(file);
-      for(i=0;i<10;i++)                /* currently unused bytes */
-       fgetc(file);
-    }
-    else
-      default_player.level_nr = default_player.handicap;
-
-    if (feof(file))            /* Spieler noch nicht in Liste enthalten */
-      break;
-    else                       /* prüfen, ob Spieler in Liste enthalten */
-      if (!strncmp(default_player.login_name,
-                  local_player->login_name, MAX_NAMELEN-1))
-      {
-       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)
+  fseek(file,
+       SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)),
+       SEEK_SET);
+  for(i=0;i<MAX_SCORE_ENTRIES;i++)
   {
-    fputc(local_player->level_nr,file);
-    for(i=0;i<10;i++)          /* currently unused bytes */
-      fputc(0,file);
+    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);
 }
 
-#endif
 
 
+#if 0
 
 void LoadJoystickData()
 {
@@ -807,10 +544,18 @@ void SaveJoystickData()
 
 }
 
+#endif
+
+
+
 /* ------------------------------------------------------------------------- */
 /* new setup functions                                                       */
 /* ------------------------------------------------------------------------- */
 
+#define MAX_LINE_LEN                   1000
+#define MAX_SETUP_TOKEN_LEN            100
+#define MAX_SETUP_VALUE_LEN            100
+
 #define TOKEN_STR_FILE_IDENTIFIER      "file_identifier"
 #define TOKEN_STR_LAST_LEVEL_SERIES    "last_level_series"
 #define TOKEN_STR_ALIAS_NAME           "alias_name"
@@ -827,53 +572,84 @@ void SaveJoystickData()
 #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_ALIAS_NAMES                11
+
+#define SETUP_TOKEN_USE_JOYSTICK       12
+#define SETUP_TOKEN_JOY_DEVICE_NAME    13
+#define SETUP_TOKEN_JOY_XLEFT          14
+#define SETUP_TOKEN_JOY_XMIDDLE                15
+#define SETUP_TOKEN_JOY_XRIGHT         16
+#define SETUP_TOKEN_JOY_YUPPER         17
+#define SETUP_TOKEN_JOY_YMIDDLE                18
+#define SETUP_TOKEN_JOY_YLOWER         19
+#define SETUP_TOKEN_JOY_SNAP           20
+#define SETUP_TOKEN_JOY_BOMB           21
+#define SETUP_TOKEN_KEY_LEFT           22
+#define SETUP_TOKEN_KEY_RIGHT          23
+#define SETUP_TOKEN_KEY_UP             24
+#define SETUP_TOKEN_KEY_DOWN           25
+#define SETUP_TOKEN_KEY_SNAP           26
+#define SETUP_TOKEN_KEY_BOMB           27
+
+#define NUM_SETUP_TOKENS               28
+
+#define FIRST_GLOBAL_SETUP_TOKEN       SETUP_TOKEN_SOUND
+#define LAST_GLOBAL_SETUP_TOKEN                SETUP_TOKEN_ALIAS_NAMES
+
+#define FIRST_PLAYER_SETUP_TOKEN       SETUP_TOKEN_USE_JOYSTICK
+#define LAST_PLAYER_SETUP_TOKEN                SETUP_TOKEN_KEY_BOMB
+
+#define TYPE_BOOLEAN                   1
+#define TYPE_SWITCH                    2
+#define TYPE_KEYSYM                    3
+#define TYPE_INTEGER                   4
+#define TYPE_STRING                    5
+
+static struct SetupInfo si;
+static struct SetupInputInfo sii;
 static struct
 {
-  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)
@@ -918,7 +694,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)
@@ -932,19 +708,32 @@ static boolean get_string_boolean_value(char *s)
     return FALSE;
 }
 
+
+
+#if 0
+
 static char *getSetupToken(int token_nr)
 {
-  return setup_info[token_nr].token;
+  return token_info[token_nr].text;
 }
 
 static char *getSetupValue(int token_nr, boolean token_value)
 {
+  return (token_value == TRUE ? "true" : "false");
+
+  /*
   if (token_value == TRUE)
-    return setup_info[token_nr].value_true;
+    return token_info[token_nr].value_true;
   else
-    return setup_info[token_nr].value_false;
+    return token_info[token_nr].value_false;
+  */
+
 }
 
+#endif
+
+
+
 static char *getFormattedSetupEntry(char *token, char *value)
 {
   int i;
@@ -960,6 +749,10 @@ static char *getFormattedSetupEntry(char *token, char *value)
   return entry;
 }
 
+
+
+#if 0
+
 static char *getSetupEntry(char *prefix, int token_nr, int token_value)
 {
   int i;
@@ -1002,6 +795,9 @@ static char *getSetupEntryWithComment(char *prefix,int token_nr, KeySym keysym)
   return entry;
 }
 
+#endif
+
+
 static void freeSetupFileList(struct SetupFileList *setup_file_list)
 {
   if (!setup_file_list)
@@ -1101,13 +897,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")))
@@ -1170,19 +959,6 @@ static struct SetupFileList *loadSetupFileList(char *filename)
 
     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
-
-
-
   }
 
   fclose(file);
@@ -1232,8 +1008,8 @@ static void decodeSetupFileList(struct SetupFileList *setup_file_list)
   int player_nr = 0;
   char *token;
   char *token_value;
-  int token_integer_value;
   boolean token_boolean_value;
+  int token_integer_value;
   int token_player_prefix_len;
 
   if (!setup_file_list)
@@ -1241,8 +1017,8 @@ static void decodeSetupFileList(struct SetupFileList *setup_file_list)
 
   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_integer_value = get_string_integer_value(token_value);
 
   token_player_prefix_len = strlen(TOKEN_STR_PLAYER_PREFIX);
 
@@ -1260,7 +1036,7 @@ static void decodeSetupFileList(struct SetupFileList *setup_file_list)
 
   for (i=0; i<NUM_SETUP_TOKENS; i++)
   {
-    if (strcmp(token, setup_info[i].token) == 0)
+    if (strcmp(token, token_info[i].text) == 0)
     {
       token_nr = i;
       break;
@@ -1275,51 +1051,74 @@ static void decodeSetupFileList(struct SetupFileList *setup_file_list)
   switch (token_nr)
   {
     case SETUP_TOKEN_SOUND:
-      setup.sound_on = token_boolean_value;
+      setup.sound = token_boolean_value;
       break;
     case SETUP_TOKEN_SOUND_LOOPS:
-      setup.sound_loops_on = token_boolean_value;
+      setup.sound_loops = token_boolean_value;
       break;
     case SETUP_TOKEN_SOUND_MUSIC:
-      setup.sound_music_on = token_boolean_value;
+      setup.sound_music = token_boolean_value;
       break;
     case SETUP_TOKEN_SOUND_SIMPLE:
-      setup.sound_simple_on = token_boolean_value;
+      setup.sound_simple = token_boolean_value;
       break;
     case SETUP_TOKEN_TOONS:
-      setup.toons_on = token_boolean_value;
+      setup.toons = token_boolean_value;
       break;
-    case SETUP_TOKEN_DIRECT_DRAW:
-      setup.direct_draw_on = !token_boolean_value;
+    case SETUP_TOKEN_DOUBLE_BUFFERING:
+      setup.double_buffering = token_boolean_value;
       break;
     case SETUP_TOKEN_SCROLL_DELAY:
-      setup.scroll_delay_on = token_boolean_value;
+      setup.scroll_delay = token_boolean_value;
       break;
     case SETUP_TOKEN_SOFT_SCROLLING:
-      setup.soft_scrolling_on = token_boolean_value;
+      setup.soft_scrolling = token_boolean_value;
       break;
     case SETUP_TOKEN_FADING:
-      setup.fading_on = token_boolean_value;
+      setup.fading = token_boolean_value;
       break;
     case SETUP_TOKEN_AUTORECORD:
-      setup.autorecord_on = token_boolean_value;
+      setup.autorecord = token_boolean_value;
       break;
     case SETUP_TOKEN_QUICK_DOORS:
       setup.quick_doors = token_boolean_value;
       break;
 
+    case SETUP_TOKEN_ALIAS_NAME:
+      strncpy(setup.alias_name, token_value, MAX_NAMELEN-1);
+      setup.alias_name[MAX_NAMELEN-1] = '\0';
+      break;
+
     case SETUP_TOKEN_USE_JOYSTICK:
       setup.input[player_nr].use_joystick = token_boolean_value;
       break;
-    case SETUP_TOKEN_JOYSTICK_NR:
-      if (token_integer_value < 0 || token_integer_value > 1)
-       token_integer_value = 1;
-      setup.input[player_nr].joystick_nr = token_integer_value - 1;
+    case SETUP_TOKEN_JOY_DEVICE_NAME:
+      strncpy(setup.input[player_nr].joy.device_name, token_value,
+             MAX_FILENAME_LEN-1);
+      setup.input[player_nr].joy.device_name[MAX_FILENAME_LEN-1] = '\0';
       break;
     case SETUP_TOKEN_JOY_SNAP:
       setup.input[player_nr].joy.snap = getJoySymbolFromJoyName(token_value);
       break;
-    case SETUP_TOKEN_JOY_BOMB    :
+    case SETUP_TOKEN_JOY_XLEFT:
+      setup.input[player_nr].joy.xleft = token_integer_value;
+      break;
+    case SETUP_TOKEN_JOY_XMIDDLE:
+      setup.input[player_nr].joy.xmiddle = token_integer_value;
+      break;
+    case SETUP_TOKEN_JOY_XRIGHT:
+      setup.input[player_nr].joy.xright = token_integer_value;
+      break;
+    case SETUP_TOKEN_JOY_YUPPER:
+      setup.input[player_nr].joy.yupper = token_integer_value;
+      break;
+    case SETUP_TOKEN_JOY_YMIDDLE:
+      setup.input[player_nr].joy.ymiddle = token_integer_value;
+      break;
+    case SETUP_TOKEN_JOY_YLOWER:
+      setup.input[player_nr].joy.ylower = token_integer_value;
+      break;
+    case SETUP_TOKEN_JOY_BOMB:
       setup.input[player_nr].joy.bomb = getJoySymbolFromJoyName(token_value);
       break;
     case SETUP_TOKEN_KEY_LEFT:
@@ -1341,11 +1140,6 @@ static void decodeSetupFileList(struct SetupFileList *setup_file_list)
       setup.input[player_nr].key.bomb = 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';
-      break;
-
     case TOKEN_INVALID:
       Error(ERR_WARN, "unknown token '%s' not recognized", token);
       break;
@@ -1358,6 +1152,46 @@ static void decodeSetupFileList(struct SetupFileList *setup_file_list)
   decodeSetupFileList(setup_file_list->next);
 }
 
+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 = getSetupFileListEntry(level_setup_list, level_series_name);
+
+  if (token_value)
+  {
+    int highest_level_nr = leveldir[level_series_nr].levels - 1;
+
+    last_level_nr = atoi(token_value);
+
+    if (last_level_nr < 0)
+      last_level_nr = 0;
+    if (last_level_nr > highest_level_nr)
+      last_level_nr = highest_level_nr;
+  }
+
+  return last_level_nr;
+}
+
 void LoadSetup()
 {
   int i;
@@ -1366,28 +1200,34 @@ void LoadSetup()
 
   /* always start with reliable default setup values */
 
-  strncpy(local_player->login_name, GetLoginName(), MAX_NAMELEN-1);
-  local_player->login_name[MAX_NAMELEN-1] = '\0';
-
-  strncpy(local_player->alias_name, GetLoginName(), MAX_NAMELEN-1);
-  local_player->alias_name[MAX_NAMELEN-1] = '\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.sound = TRUE;
+  setup.sound_loops = FALSE;
+  setup.sound_music = FALSE;
+  setup.sound_simple = FALSE;
+  setup.toons = TRUE;
+  setup.double_buffering = TRUE;
+  setup.direct_draw = !setup.double_buffering;
+  setup.scroll_delay = FALSE;
+  setup.soft_scrolling = TRUE;
+  setup.fading = FALSE;
+  setup.autorecord = FALSE;
   setup.quick_doors = FALSE;
 
+  strncpy(setup.login_name, GetLoginName(), MAX_NAMELEN-1);
+  setup.login_name[MAX_NAMELEN-1] = '\0';
+  strncpy(setup.alias_name, GetLoginName(), MAX_NAMELEN-1);
+  setup.alias_name[MAX_NAMELEN-1] = '\0';
+
   for (i=0; i<MAX_PLAYERS; i++)
   {
     setup.input[i].use_joystick = FALSE;
-    setup.input[i].joystick_nr = 0;
+    strcpy(setup.input[i].joy.device_name, joystick_device_name[i]);
+    setup.input[i].joy.xleft   = JOYSTICK_XLEFT;
+    setup.input[i].joy.xmiddle = JOYSTICK_XMIDDLE;
+    setup.input[i].joy.xright  = JOYSTICK_XRIGHT;
+    setup.input[i].joy.yupper  = JOYSTICK_YUPPER;
+    setup.input[i].joy.ymiddle = JOYSTICK_YMIDDLE;
+    setup.input[i].joy.ylower  = JOYSTICK_YLOWER;
     setup.input[i].joy.snap  = (i == 0 ? JOY_BUTTON_1 : 0);
     setup.input[i].joy.bomb  = (i == 0 ? JOY_BUTTON_2 : 0);
     setup.input[i].key.left  = (i == 0 ? DEFAULT_KEY_LEFT  : KEY_UNDEFINDED);
@@ -1412,71 +1252,16 @@ void LoadSetup()
     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()
-{
-  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)
-  {
-    int i;
-
-    char *last_level_series =
-      getSetupFileListEntry(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES);
-
-    if (last_level_series)
-    {
-      for (i=0; i<num_leveldirs; i++)
-      {
-       if (strcmp(last_level_series, leveldir[i].filename) == 0)
-       {
-         char *token_value =
-           getSetupFileListEntry(level_setup_list, last_level_series);
-
-         leveldir_nr = i;
-
-         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;
-       }
-      }
-    }
-
 
 #if 0
-    printSetupFileList(level_setup_list);
-#endif
-
-    checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
-  }
-  else
-    Error(ERR_RETURN, "using default setup values");
-}
 
 void SaveSetup()
 {
@@ -1499,34 +1284,34 @@ void SaveSetup()
 
   fprintf(file, "%s\n",
          getSetupEntry("", SETUP_TOKEN_SOUND,
-                       setup.sound_on));
+                       setup.sound));
   fprintf(file, "%s\n",
          getSetupEntry("", SETUP_TOKEN_SOUND_LOOPS,
-                       setup.sound_loops_on));
+                       setup.sound_loops));
   fprintf(file, "%s\n",
          getSetupEntry("", SETUP_TOKEN_SOUND_MUSIC,
-                       setup.sound_music_on));
+                       setup.sound_music));
   fprintf(file, "%s\n",
          getSetupEntry("", SETUP_TOKEN_SOUND_SIMPLE,
-                       setup.sound_simple_on));
+                       setup.sound_simple));
   fprintf(file, "%s\n",
          getSetupEntry("", SETUP_TOKEN_TOONS,
-                       setup.toons_on));
+                       setup.toons));
   fprintf(file, "%s\n",
          getSetupEntry("", SETUP_TOKEN_DIRECT_DRAW,
-                       setup.direct_draw_on));
+                       setup.direct_draw));
   fprintf(file, "%s\n",
          getSetupEntry("", SETUP_TOKEN_SCROLL_DELAY,
-                       setup.scroll_delay_on));
+                       setup.scroll_delay));
   fprintf(file, "%s\n",
          getSetupEntry("", SETUP_TOKEN_SOFT_SCROLLING,
-                       setup.soft_scrolling_on));
+                       setup.soft_scrolling));
   fprintf(file, "%s\n",
          getSetupEntry("", SETUP_TOKEN_FADING,
-                       setup.fading_on));
+                       setup.fading));
   fprintf(file, "%s\n",
          getSetupEntry("", SETUP_TOKEN_AUTORECORD,
-                       setup.autorecord_on));
+                       setup.autorecord));
   fprintf(file, "%s\n",
          getSetupEntry("", SETUP_TOKEN_QUICK_DOORS,
                        setup.quick_doors));
@@ -1535,7 +1320,7 @@ void SaveSetup()
 
   fprintf(file, "%s\n",
          getFormattedSetupEntry(TOKEN_STR_ALIAS_NAME,
-                                local_player->alias_name));
+                                setup.alias_name));
 
   for (i=0; i<MAX_PLAYERS; i++)
   {
@@ -1548,10 +1333,29 @@ void SaveSetup()
     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_DEVICE_NAME),
+           setup.input[i].joy.device_name);
+
+    fprintf(file, "%s%s:      %d\n", prefix,
+           getSetupToken(SETUP_TOKEN_JOY_XLEFT),
+           setup.input[i].joy.xleft);
+    fprintf(file, "%s%s:      %d\n", prefix,
+           getSetupToken(SETUP_TOKEN_JOY_XMIDDLE),
+           setup.input[i].joy.xmiddle);
+    fprintf(file, "%s%s:      %d\n", prefix,
+           getSetupToken(SETUP_TOKEN_JOY_XRIGHT),
+           setup.input[i].joy.xright);
+    fprintf(file, "%s%s:      %d\n", prefix,
+           getSetupToken(SETUP_TOKEN_JOY_YUPPER),
+           setup.input[i].joy.yupper);
+    fprintf(file, "%s%s:      %d\n", prefix,
+           getSetupToken(SETUP_TOKEN_JOY_YMIDDLE),
+           setup.input[i].joy.ymiddle);
+    fprintf(file, "%s%s:      %d\n", prefix,
+           getSetupToken(SETUP_TOKEN_JOY_YLOWER),
+           setup.input[i].joy.ylower);
     fprintf(file, "%s%s:      %s\n", prefix,
            getSetupToken(SETUP_TOKEN_JOY_SNAP),
            getJoyNameFromJoySymbol(setup.input[i].joy.snap));
@@ -1584,6 +1388,148 @@ void SaveSetup()
   chmod(filename, SETUP_PERMS);
 }
 
+#endif
+
+
+
+static char *getSetupLine(char *prefix, int token_nr)
+{
+  int i;
+  static char entry[MAX_LINE_LEN];
+  int token_type = token_info[token_nr].type;
+  void *token_value = token_info[token_nr].value;
+  char *token_text = token_info[token_nr].text;
+
+  /* start with the prefix, token and some spaces to format output line */
+  sprintf(entry, "%s%s:", prefix, token_text);
+  for (i=strlen(entry); i<TOKEN_VALUE_POSITION; i++)
+    strcat(entry, " ");
+
+  /* continue with the token's value (which can have different types) */
+  switch (token_type)
+  {
+    case TYPE_BOOLEAN:
+      strcat(entry, (*(boolean *)token_value ? "true" : "false"));
+      break;
+
+    case TYPE_SWITCH:
+      strcat(entry, (*(boolean *)token_value ? "on" : "off"));
+      break;
+
+    case TYPE_KEYSYM:
+      {
+       KeySym keysym = *(KeySym *)token_value;
+       char *keyname = getKeyNameFromKeySym(keysym);
+
+       strcat(entry, getX11KeyNameFromKeySym(keysym));
+       for (i=strlen(entry); i<50; i++)
+         strcat(entry, " ");
+
+       /* add comment, if useful */
+       if (strcmp(keyname, "(undefined)") != 0 &&
+           strcmp(keyname, "(unknown)") != 0)
+       {
+         strcat(entry, "# ");
+         strcat(entry, keyname);
+       }
+      }
+      break;
+
+    case TYPE_INTEGER:
+      {
+       char buffer[MAX_LINE_LEN];
+
+       sprintf(buffer, "%d", *(int *)token_value);
+       strcat(entry, buffer);
+      }
+      break;
+
+    case TYPE_STRING:
+      strcat(entry, *(char **)token_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_WARN, "cannot write setup file '%s'", filename);
+    return;
+  }
+
+  fprintf(file, "%s:              %s\n",
+         TOKEN_STR_FILE_IDENTIFIER, SETUP_COOKIE);
+
+  fprintf(file, "\n");
+
+  for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++)
+    fprintf(file, "%s\n", getSetupLine("", i));
+
+  for (pnr=0; pnr<MAX_PLAYERS; pnr++)
+  {
+    char prefix[30];
+
+    sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, i + 1);
+    fprintf(file, "\n");
+
+    for (i=FIRST_PLAYER_SETUP_TOKEN; i<=LAST_PLAYER_SETUP_TOKEN; i++)
+    {
+      sii = setup.input[pnr];
+      fprintf(file, "%s\n", getSetupLine(prefix, i));
+    }
+  }
+
+  fclose(file);
+
+  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 =
+      getSetupFileListEntry(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES);
+
+    leveldir_nr = getLevelSeriesNrFromLevelSeriesName(last_level_series);
+    level_nr = getLastPlayedLevelOfLevelSeries(last_level_series);
+
+#if 0
+    printSetupFileList(level_setup_list);
+#endif
+
+    checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
+  }
+  else
+    Error(ERR_WARN, "using default setup values");
+}
+
 void SaveLevelSetup()
 {
   char filename[MAX_FILENAME_LEN];