X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ffiles.c;h=fa40845efe78e496e7e27c4fb9e57a19ec3c4cf2;hp=67f0168c42fbf64e068c11cb09a53017662a500f;hb=f806f2ad0dfa82c3abd3d027250a549ca22f4374;hpb=d2587727d750fdf2aae4eb8f4acb487a5c211041

diff --git a/src/files.c b/src/files.c
index 67f0168c..fa40845e 100644
--- a/src/files.c
+++ b/src/files.c
@@ -284,10 +284,10 @@ static char *getLevelFilename(int nr)
     free(filename);
 
   sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION);
-  filename = getPath3((leveldir[leveldir_nr].user_defined ?
+  filename = getPath3((leveldir_current->user_defined ?
 		       getUserLevelDir("") :
 		       options.level_directory),
-		      leveldir[leveldir_nr].filename,
+		      leveldir_current->fullpath,
 		      basename);
 
   return filename;
@@ -302,7 +302,7 @@ static char *getTapeFilename(int nr)
     free(filename);
 
   sprintf(basename, "%03d.%s", nr, TAPEFILE_EXTENSION);
-  filename = getPath2(getTapeDir(leveldir[leveldir_nr].filename), basename);
+  filename = getPath2(getTapeDir(leveldir_current->filename), basename);
 
   return filename;
 }
@@ -316,7 +316,7 @@ static char *getScoreFilename(int nr)
     free(filename);
 
   sprintf(basename, "%03d.%s", nr, SCOREFILE_EXTENSION);
-  filename = getPath2(getScoreDir(leveldir[leveldir_nr].filename), basename);
+  filename = getPath2(getScoreDir(leveldir_current->filename), basename);
 
   return filename;
 }
@@ -411,32 +411,32 @@ static void setLevelInfoToDefaults()
   BorderElement = EL_BETON;
 
   /* try to determine better author name than 'anonymous' */
-  if (strcmp(leveldir[leveldir_nr].author, ANONYMOUS_NAME) != 0)
+  if (strcmp(leveldir_current->author, ANONYMOUS_NAME) != 0)
   {
-    strncpy(level.author, leveldir[leveldir_nr].author, MAX_LEVEL_AUTHOR_LEN);
+    strncpy(level.author, leveldir_current->author, MAX_LEVEL_AUTHOR_LEN);
     level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
   }
   else
   {
-    switch (LEVELCLASS(&leveldir[leveldir_nr]))
+    switch (LEVELCLASS(leveldir_current))
     {
       case LEVELCLASS_TUTORIAL:
-  	strcpy(level.author, PROGRAM_AUTHOR_STRING);
-  	break;
+	strcpy(level.author, PROGRAM_AUTHOR_STRING);
+	break;
 
       case LEVELCLASS_CONTRIBUTION:
-  	strncpy(level.author, leveldir[leveldir_nr].name,MAX_LEVEL_AUTHOR_LEN);
-  	level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
-  	break;
+	strncpy(level.author, leveldir_current->name,MAX_LEVEL_AUTHOR_LEN);
+	level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+	break;
 
       case LEVELCLASS_USER:
-  	strncpy(level.author, getRealName(), MAX_LEVEL_AUTHOR_LEN);
-  	level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
-  	break;
+	strncpy(level.author, getRealName(), MAX_LEVEL_AUTHOR_LEN);
+	level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+	break;
 
       default:
-  	/* keep default value */
-  	break;
+	/* keep default value */
+	break;
     }
   }
 }
@@ -599,7 +599,7 @@ void LoadLevel(int level_nr)
 
   /* player was faster than monsters in pre-1.0 levels */
   if (file_version == FILE_VERSION_1_0 &&
-      IS_LEVELCLASS_CONTRIBUTION(&leveldir[leveldir_nr]))
+      IS_LEVELCLASS_CONTRIBUTION(leveldir_current))
   {
     Error(ERR_WARN, "level file '%s' has version number 1.0", filename);
     Error(ERR_WARN, "using high speed movement for player");
@@ -868,7 +868,7 @@ void SaveTape(int level_nr)
   byte store_participating_players;
   int num_participating_players;
 
-  InitTapeDirectory(leveldir[leveldir_nr].filename);
+  InitTapeDirectory(leveldir_current->filename);
 
   /* if a tape still exists, ask to overwrite it */
   if (access(filename, F_OK) == 0)
@@ -993,7 +993,7 @@ void SaveScore(int level_nr)
   char *filename = getScoreFilename(level_nr);
   FILE *file;
 
-  InitScoreDirectory(leveldir[leveldir_nr].filename);
+  InitScoreDirectory(leveldir_current->filename);
 
   if (!(file = fopen(filename, "w")))
   {
@@ -1061,12 +1061,14 @@ void SaveScore(int level_nr)
 /* level directory info */
 #define LEVELINFO_TOKEN_NAME		29
 #define LEVELINFO_TOKEN_NAME_SHORT	30
-#define LEVELINFO_TOKEN_AUTHOR		31
-#define LEVELINFO_TOKEN_IMPORTED_FROM	32
-#define LEVELINFO_TOKEN_LEVELS		33
-#define LEVELINFO_TOKEN_FIRST_LEVEL	34
-#define LEVELINFO_TOKEN_SORT_PRIORITY	35
-#define LEVELINFO_TOKEN_READONLY	36
+#define LEVELINFO_TOKEN_NAME_SORTING	31
+#define LEVELINFO_TOKEN_AUTHOR		32
+#define LEVELINFO_TOKEN_IMPORTED_FROM	33
+#define LEVELINFO_TOKEN_LEVELS		34
+#define LEVELINFO_TOKEN_FIRST_LEVEL	35
+#define LEVELINFO_TOKEN_SORT_PRIORITY	36
+#define LEVELINFO_TOKEN_LEVEL_GROUP	37
+#define LEVELINFO_TOKEN_READONLY	38
 
 #define FIRST_GLOBAL_SETUP_TOKEN	SETUP_TOKEN_PLAYER_NAME
 #define LAST_GLOBAL_SETUP_TOKEN		SETUP_TOKEN_TIME_LIMIT
@@ -1135,11 +1137,13 @@ static struct
   /* level directory info */
   { TYPE_STRING,  &ldi.name,		"name"				},
   { TYPE_STRING,  &ldi.name_short,	"name_short"			},
+  { TYPE_STRING,  &ldi.name_sorting,	"name_sorting"			},
   { TYPE_STRING,  &ldi.author,		"author"			},
   { TYPE_STRING,  &ldi.imported_from,	"imported_from"			},
   { TYPE_INTEGER, &ldi.levels,		"levels"			},
   { TYPE_INTEGER, &ldi.first_level,	"first_level"			},
   { TYPE_INTEGER, &ldi.sort_priority,	"sort_priority"			},
+  { TYPE_BOOLEAN, &ldi.level_group,	"level_group"			},
   { TYPE_BOOLEAN, &ldi.readonly,	"readonly"			}
 };
 
@@ -1401,19 +1405,66 @@ static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
 static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi)
 {
   ldi->filename = NULL;
+  ldi->fullpath = NULL;
+  ldi->basepath = NULL;
   ldi->name = getStringCopy(ANONYMOUS_NAME);
   ldi->name_short = NULL;
+  ldi->name_sorting = NULL;
   ldi->author = getStringCopy(ANONYMOUS_NAME);
   ldi->imported_from = NULL;
   ldi->levels = 0;
   ldi->first_level = 0;
   ldi->last_level = 0;
   ldi->sort_priority = LEVELCLASS_UNDEFINED;	/* default: least priority */
-  ldi->readonly = TRUE;
+  ldi->level_group = FALSE;
+  ldi->parent_link = FALSE;
   ldi->user_defined = FALSE;
+  ldi->readonly = TRUE;
   ldi->color = 0;
   ldi->class_desc = NULL;
   ldi->handicap_level = 0;
+  ldi->cl_first = -1;
+  ldi->cl_cursor = -1;
+
+  ldi->node_parent = NULL;
+  ldi->node_group = NULL;
+  ldi->next = NULL;
+}
+
+static void setLevelDirInfoToDefaultsFromParent(struct LevelDirInfo *ldi,
+						struct LevelDirInfo *parent)
+{
+  if (parent == NULL)
+  {
+    setLevelDirInfoToDefaults(ldi);
+    return;
+  }
+
+  /* first copy all values from the parent structure ... */
+  *ldi = *parent;
+
+  /* ... then set all fields to default that cannot be inherited from parent.
+     This is especially important for all those fields that can be set from
+     the 'levelinfo.conf' config file, because the function 'setSetupInfo()'
+     calls 'free()' for all already set token values which requires that no
+     other structure's pointer may point to them!
+  */
+
+  ldi->filename = NULL;
+  ldi->fullpath = NULL;
+  ldi->basepath = NULL;
+  ldi->name = getStringCopy(ANONYMOUS_NAME);
+  ldi->name_short = NULL;
+  ldi->name_sorting = NULL;
+  ldi->author = getStringCopy(parent->author);
+  ldi->imported_from = getStringCopy(parent->imported_from);
+
+  ldi->level_group = FALSE;
+  ldi->parent_link = FALSE;
+
+  ldi->node_parent = parent;
+  ldi->node_group = NULL;
+  ldi->next = NULL;
 }
 
 static void setSetupInfoToDefaults(struct SetupInfo *si)
@@ -1526,30 +1577,18 @@ static void decodeSetupFileList(struct SetupFileList *setup_file_list)
   }
 }
 
-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;
-}
-
 static int compareLevelDirInfoEntries(const void *object1, const void *object2)
 {
-  const struct LevelDirInfo *entry1 = object1;
-  const struct LevelDirInfo *entry2 = object2;
+  const struct LevelDirInfo *entry1 = *((struct LevelDirInfo **)object1);
+  const struct LevelDirInfo *entry2 = *((struct LevelDirInfo **)object2);
   int compare_result;
 
-  if (entry1->sort_priority == entry2->sort_priority)
+  if (entry1->parent_link || entry2->parent_link)
+    compare_result = (entry1->parent_link ? -1 : +1);
+  else if (entry1->sort_priority == entry2->sort_priority)
   {
-    char *name1 = getStringToLower(entry1->name_short);
-    char *name2 = getStringToLower(entry2->name_short);
+    char *name1 = getStringToLower(entry1->name_sorting);
+    char *name2 = getStringToLower(entry2->name_sorting);
 
     compare_result = strcmp(name1, name2);
 
@@ -1564,109 +1603,170 @@ static int compareLevelDirInfoEntries(const void *object1, const void *object2)
   return compare_result;
 }
 
-static int LoadLevelInfoFromLevelDir(char *level_directory, int start_entry)
+static void createParentLevelDirNode(struct LevelDirInfo *node_parent)
+{
+  struct LevelDirInfo *leveldir_new = newLevelDirInfo();
+
+  setLevelDirInfoToDefaults(leveldir_new);
+
+  leveldir_new->node_parent = node_parent;
+  leveldir_new->parent_link = TRUE;
+
+  leveldir_new->name = ".. (parent directory)";
+  leveldir_new->name_short = getStringCopy(leveldir_new->name);
+  leveldir_new->name_sorting = getStringCopy(leveldir_new->name);
+
+  leveldir_new->filename = "..";
+  leveldir_new->fullpath = getStringCopy(node_parent->fullpath);
+
+  leveldir_new->sort_priority = node_parent->sort_priority;
+  leveldir_new->class_desc = getLevelClassDescription(leveldir_new);
+
+  pushLevelDirInfo(&node_parent->node_group, leveldir_new);
+}
+
+static void LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first,
+				      struct LevelDirInfo *node_parent,
+				      char *level_directory)
 {
   DIR *dir;
-  struct stat file_status;
-  char *directory = NULL;
-  char *filename = NULL;
-  struct SetupFileList *setup_file_list = NULL;
   struct dirent *dir_entry;
-  int i, current_entry = start_entry;
+  boolean valid_entry_found = FALSE;
 
   if ((dir = opendir(level_directory)) == NULL)
   {
     Error(ERR_WARN, "cannot read level directory '%s'", level_directory);
-    return current_entry;
+    return;
   }
 
-  while (current_entry < MAX_LEVDIR_ENTRIES)
+  while ((dir_entry = readdir(dir)) != NULL)	/* loop until last dir entry */
   {
-    if ((dir_entry = readdir(dir)) == NULL)	/* last directory entry */
-      break;
+    struct SetupFileList *setup_file_list = NULL;
+    struct stat file_status;
+    char *directory_name = dir_entry->d_name;
+    char *directory_path = getPath2(level_directory, directory_name);
+    char *filename = NULL;
 
     /* skip entries for current and parent directory */
-    if (strcmp(dir_entry->d_name, ".")  == 0 ||
-	strcmp(dir_entry->d_name, "..") == 0)
+    if (strcmp(directory_name, ".")  == 0 ||
+	strcmp(directory_name, "..") == 0)
+    {
+      free(directory_path);
       continue;
+    }
 
     /* find out if directory entry is itself a directory */
-    directory = getPath2(level_directory, dir_entry->d_name);
-    if (stat(directory, &file_status) != 0 ||		/* cannot stat file */
+    if (stat(directory_path, &file_status) != 0 ||	/* cannot stat file */
 	(file_status.st_mode & S_IFMT) != S_IFDIR)	/* not a directory */
     {
-      free(directory);
+      free(directory_path);
       continue;
     }
 
-    filename = getPath2(directory, LEVELINFO_FILENAME);
+    filename = getPath2(directory_path, LEVELINFO_FILENAME);
     setup_file_list = loadSetupFileList(filename);
 
     if (setup_file_list)
     {
+      struct LevelDirInfo *leveldir_new = newLevelDirInfo();
+      int i;
+
       checkSetupFileListIdentifier(setup_file_list, LEVELINFO_COOKIE);
-      setLevelDirInfoToDefaults(&leveldir[current_entry]);
+      setLevelDirInfoToDefaultsFromParent(leveldir_new, node_parent);
 
-      ldi = leveldir[current_entry];
+      /* set all structure fields according to the token/value pairs */
+      ldi = *leveldir_new;
       for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++)
 	setSetupInfo(i, getTokenValue(setup_file_list, token_info[i].text));
-      leveldir[current_entry] = ldi;
-
-      if (leveldir[current_entry].name_short == NULL)
-	leveldir[current_entry].name_short =
-	  getStringCopy(leveldir[current_entry].name);
-
-      leveldir[current_entry].filename = getStringCopy(dir_entry->d_name);
-      leveldir[current_entry].last_level =
-	leveldir[current_entry].first_level +
-	leveldir[current_entry].levels - 1;
-      leveldir[current_entry].user_defined =
-	(level_directory == options.level_directory ? FALSE : TRUE);
-      leveldir[current_entry].color = LEVELCOLOR(&leveldir[current_entry]);
-      leveldir[current_entry].class_desc =
-	getLevelClassDescription(&leveldir[current_entry]);
+      *leveldir_new = ldi;
+
+      DrawInitText(leveldir_new->name, 150, FC_YELLOW);
+
+      if (leveldir_new->name_short == NULL)
+	leveldir_new->name_short = getStringCopy(leveldir_new->name);
+
+      if (leveldir_new->name_sorting == NULL)
+	leveldir_new->name_sorting = getStringCopy(leveldir_new->name);
+
+      leveldir_new->filename = getStringCopy(directory_name);
+
+      if (node_parent == NULL)		/* top level group */
+      {
+	leveldir_new->basepath = level_directory;
+	leveldir_new->fullpath = leveldir_new->filename;
+      }
+      else				/* sub level group */
+      {
+	leveldir_new->basepath = node_parent->basepath;
+	leveldir_new->fullpath = getPath2(node_parent->fullpath,
+					  directory_name);
+      }
+
+      if (leveldir_new->levels < 1)
+	leveldir_new->levels = 1;
+
+      leveldir_new->last_level =
+	leveldir_new->first_level + leveldir_new->levels - 1;
+
+      leveldir_new->user_defined =
+	(leveldir_new->basepath == options.level_directory ? FALSE : TRUE);
+
+      leveldir_new->color = LEVELCOLOR(leveldir_new);
+      leveldir_new->class_desc = getLevelClassDescription(leveldir_new);
+
+      leveldir_new->handicap_level =	/* set handicap to default value */
+	(leveldir_new->user_defined ?
+	 leveldir_new->last_level :
+	 leveldir_new->first_level);
+
+      pushLevelDirInfo(node_first, leveldir_new);
 
       freeSetupFileList(setup_file_list);
-      current_entry++;
+      valid_entry_found = TRUE;
+
+      if (leveldir_new->level_group)
+      {
+	/* create node to link back to current level directory */
+	createParentLevelDirNode(leveldir_new);
+
+	/* step into sub-directory and look for more level series */
+	LoadLevelInfoFromLevelDir(&leveldir_new->node_group,
+				  leveldir_new, directory_path);
+      }
     }
     else
-      Error(ERR_WARN, "ignoring level directory '%s'", directory);
+      Error(ERR_WARN, "ignoring level directory '%s'", directory_path);
 
-    free(directory);
+    free(directory_path);
     free(filename);
   }
 
-  if (current_entry == MAX_LEVDIR_ENTRIES)
-    Error(ERR_WARN, "using %d level directories -- ignoring the rest",
-	  current_entry);
-
   closedir(dir);
 
-  if (current_entry == start_entry)
+  if (!valid_entry_found)
     Error(ERR_WARN, "cannot find any valid level series in directory '%s'",
 	  level_directory);
-
-  return current_entry;
 }
 
 void LoadLevelInfo()
 {
   InitUserLevelDirectory(getLoginName());
 
-  num_leveldirs = 0;
-  leveldir_nr = 0;
+  DrawInitText("Loading level series:", 120, FC_GREEN);
 
-  num_leveldirs = LoadLevelInfoFromLevelDir(options.level_directory,
-					    num_leveldirs);
-  num_leveldirs = LoadLevelInfoFromLevelDir(getUserLevelDir(""),
-					    num_leveldirs);
+  LoadLevelInfoFromLevelDir(&leveldir_first, NULL, options.level_directory);
+  LoadLevelInfoFromLevelDir(&leveldir_first, NULL, getUserLevelDir(""));
 
-  if (num_leveldirs == 0)
+  leveldir_current = getFirstValidLevelSeries(leveldir_first);
+
+  if (leveldir_first == NULL)
     Error(ERR_EXIT, "cannot find any valid level series in any directory");
 
-  if (num_leveldirs > 1)
-    qsort(leveldir, num_leveldirs, sizeof(struct LevelDirInfo),
-	  compareLevelDirInfoEntries);
+  sortLevelDirInfo(&leveldir_first, compareLevelDirInfoEntries);
+
+#if 0
+  dumpLevelDirInfo(leveldir_first, 0);
+#endif
 }
 
 static void SaveUserLevelInfo()
@@ -1698,7 +1798,9 @@ static void SaveUserLevelInfo()
 	  getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, LEVELINFO_COOKIE));
 
   for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++)
-    if (i != LEVELINFO_TOKEN_NAME_SHORT && i != LEVELINFO_TOKEN_IMPORTED_FROM)
+    if (i != LEVELINFO_TOKEN_NAME_SHORT &&
+	i != LEVELINFO_TOKEN_NAME_SORTING &&
+	i != LEVELINFO_TOKEN_IMPORTED_FROM)
       fprintf(file, "%s\n", getSetupLine("", i));
 
   fclose(file);
@@ -1866,7 +1968,7 @@ void LoadLevelSetup_LastSeries()
   struct SetupFileList *level_setup_list = NULL;
 
   /* always start with reliable default values */
-  leveldir_nr = 0;
+  leveldir_current = leveldir_first;
 
   /* ----------------------------------------------------------------------- */
   /* ~/.rocksndiamonds/levelsetup.conf                                       */
@@ -1879,7 +1981,9 @@ void LoadLevelSetup_LastSeries()
     char *last_level_series =
       getTokenValue(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES);
 
-    leveldir_nr = getLevelSeriesNrFromLevelSeriesName(last_level_series);
+    leveldir_current = getLevelDirInfoFromFilename(last_level_series);
+    if (leveldir_current == NULL)
+      leveldir_current = leveldir_first;
 
     checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
 
@@ -1894,7 +1998,7 @@ void LoadLevelSetup_LastSeries()
 void SaveLevelSetup_LastSeries()
 {
   char *filename;
-  char *level_subdir = leveldir[leveldir_nr].filename;
+  char *level_subdir = leveldir_current->filename;
   FILE *file;
 
   /* ----------------------------------------------------------------------- */
@@ -1923,21 +2027,71 @@ void SaveLevelSetup_LastSeries()
   chmod(filename, SETUP_PERMS);
 }
 
-void LoadLevelSetup_SeriesInfo(int leveldir_nr)
+static void checkSeriesInfo()
+{
+  static char *level_directory = NULL;
+  DIR *dir;
+  struct dirent *dir_entry;
+
+  /* check for more levels besides the 'levels' field of 'levelinfo.conf' */
+
+  level_directory = getPath2((leveldir_current->user_defined ?
+			      getUserLevelDir("") :
+			      options.level_directory),
+			     leveldir_current->filename);
+
+  if ((dir = opendir(level_directory)) == NULL)
+  {
+    Error(ERR_WARN, "cannot read level directory '%s'", level_directory);
+    return;
+  }
+
+  while ((dir_entry = readdir(dir)) != NULL)	/* last directory entry */
+  {
+    if (strlen(dir_entry->d_name) > 4 &&
+	dir_entry->d_name[3] == '.' &&
+	strcmp(&dir_entry->d_name[4], LEVELFILE_EXTENSION) == 0)
+    {
+      char levelnum_str[4];
+      int levelnum_value;
+
+      strncpy(levelnum_str, dir_entry->d_name, 3);
+      levelnum_str[3] = '\0';
+
+      levelnum_value = atoi(levelnum_str);
+
+      if (levelnum_value < leveldir_current->first_level)
+      {
+	Error(ERR_WARN, "additional level %d found", levelnum_value);
+	leveldir_current->first_level = levelnum_value;
+      }
+      else if (levelnum_value > leveldir_current->last_level)
+      {
+	Error(ERR_WARN, "additional level %d found", levelnum_value);
+	leveldir_current->last_level = levelnum_value;
+      }
+    }
+  }
+
+  closedir(dir);
+}
+
+void LoadLevelSetup_SeriesInfo()
 {
   char *filename;
   struct SetupFileList *level_setup_list = NULL;
-  char *level_subdir = leveldir[leveldir_nr].filename;
+  char *level_subdir = leveldir_current->filename;
 
   /* always start with reliable default values */
-  level_nr = 0;
-  leveldir[leveldir_nr].handicap_level = 0;
+  level_nr = leveldir_current->first_level;
+
+  checkSeriesInfo(leveldir_current);
 
   /* ----------------------------------------------------------------------- */
   /* ~/.rocksndiamonds/levelsetup/<level series>/levelsetup.conf             */
   /* ----------------------------------------------------------------------- */
 
-  level_subdir = leveldir[leveldir_nr].filename;
+  level_subdir = leveldir_current->filename;
 
   filename = getPath2(getLevelSetupDir(level_subdir), LEVELSETUP_FILENAME);
 
@@ -1951,10 +2105,10 @@ void LoadLevelSetup_SeriesInfo(int leveldir_nr)
     {
       level_nr = atoi(token_value);
 
-      if (level_nr < leveldir[leveldir_nr].first_level)
-	level_nr = leveldir[leveldir_nr].first_level;
-      if (level_nr > leveldir[leveldir_nr].last_level)
-	level_nr = leveldir[leveldir_nr].last_level;
+      if (level_nr < leveldir_current->first_level)
+	level_nr = leveldir_current->first_level;
+      if (level_nr > leveldir_current->last_level)
+	level_nr = leveldir_current->last_level;
     }
 
     token_value = getTokenValue(level_setup_list, TOKEN_STR_HANDICAP_LEVEL);
@@ -1963,12 +2117,15 @@ void LoadLevelSetup_SeriesInfo(int leveldir_nr)
     {
       int level_nr = atoi(token_value);
 
-      if (level_nr < leveldir[leveldir_nr].first_level)
-	level_nr = leveldir[leveldir_nr].first_level;
-      if (level_nr > leveldir[leveldir_nr].last_level + 1)
-	level_nr = leveldir[leveldir_nr].last_level;
+      if (level_nr < leveldir_current->first_level)
+	level_nr = leveldir_current->first_level;
+      if (level_nr > leveldir_current->last_level + 1)
+	level_nr = leveldir_current->last_level;
+
+      if (leveldir_current->user_defined)
+	level_nr = leveldir_current->last_level;
 
-      leveldir[leveldir_nr].handicap_level = level_nr;
+      leveldir_current->handicap_level = level_nr;
     }
 
     checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
@@ -1981,12 +2138,12 @@ void LoadLevelSetup_SeriesInfo(int leveldir_nr)
   free(filename);
 }
 
-void SaveLevelSetup_SeriesInfo(int leveldir_nr)
+void SaveLevelSetup_SeriesInfo()
 {
   char *filename;
-  char *level_subdir = leveldir[leveldir_nr].filename;
+  char *level_subdir = leveldir_current->filename;
   char *level_nr_str = int2str(level_nr, 0);
-  char *handicap_level_str = int2str(leveldir[leveldir_nr].handicap_level, 0);
+  char *handicap_level_str = int2str(leveldir_current->handicap_level, 0);
   FILE *file;
 
   /* ----------------------------------------------------------------------- */
@@ -2018,39 +2175,22 @@ void SaveLevelSetup_SeriesInfo(int leveldir_nr)
 }
 
 #ifdef MSDOS
-static boolean initErrorFile()
+void initErrorFile()
 {
   char *filename;
-  FILE *error_file;
 
   InitUserDataDirectory();
 
   filename = getPath2(getUserDataDir(), ERROR_FILENAME);
-  error_file = fopen(filename, "w");
+  unlink(filename);
   free(filename);
-
-  if (error_file == NULL)
-    return FALSE;
-
-  fclose(error_file);
-
-  return TRUE;
 }
 
 FILE *openErrorFile()
 {
-  static boolean first_access = TRUE;
   char *filename;
   FILE *error_file;
 
-  if (first_access)
-  {
-    if (!initErrorFile())
-      return NULL;
-
-    first_access = FALSE;
-  }
-
   filename = getPath2(getUserDataDir(), ERROR_FILENAME);
   error_file = fopen(filename, "a");
   free(filename);