rnd-20020402-1-src
[rocksndiamonds.git] / src / libgame / setup.c
index d0f2bc06d7c72db48bbe8a97ff2b98f0819de6fd..edfa4d35502891929c4a6cdbb1d50a515688b0bc 100644 (file)
 #include "text.h"
 #include "misc.h"
 
-
-/* file identifier strings */
-#define SETUP_COOKIE           "ROCKSNDIAMONDS_SETUP_FILE_VERSION_1.2"
-#define LEVELSETUP_COOKIE      "ROCKSNDIAMONDS_LEVELSETUP_FILE_VERSION_1.2"
-#define LEVELINFO_COOKIE       "ROCKSNDIAMONDS_LEVELINFO_FILE_VERSION_1.2"
-
 /* file names and filename extensions */
 #if !defined(PLATFORM_MSDOS)
 #define LEVELSETUP_DIRECTORY   "levelsetup"
 #define SETUP_FILENAME         "setup.conf"
 #define LEVELSETUP_FILENAME    "levelsetup.conf"
 #define LEVELINFO_FILENAME     "levelinfo.conf"
+#define GRAPHICSINFO_FILENAME  "graphicsinfo.conf"
+#define SOUNDSINFO_FILENAME    "soundsinfo.conf"
+#define MUSICINFO_FILENAME     "musicinfo.conf"
 #define LEVELFILE_EXTENSION    "level"
 #define TAPEFILE_EXTENSION     "tape"
 #define SCOREFILE_EXTENSION    "score"
@@ -41,6 +38,9 @@
 #define SETUP_FILENAME         "setup.cnf"
 #define LEVELSETUP_FILENAME    "lvlsetup.cnf"
 #define LEVELINFO_FILENAME     "lvlinfo.cnf"
+#define GRAPHICSINFO_FILENAME  "gfxinfo.cnf"
+#define SOUNDSINFO_FILENAME    "sndinfo.cnf"
+#define MUSICINFO_FILENAME     "musinfo.cnf"
 #define LEVELFILE_EXTENSION    "lvl"
 #define TAPEFILE_EXTENSION     "tap"
 #define SCOREFILE_EXTENSION    "sco"
@@ -79,47 +79,16 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] =
                         IS_LEVELCLASS_USER(n) ?                7 : \
                         9)
 
-/* values for setup file stuff */
-#define TYPE_BOOLEAN                   1
-#define TYPE_SWITCH                    2
-#define TYPE_KEY                       3
-#define TYPE_INTEGER                   4
-#define TYPE_STRING                    5
-
-#define TOKEN_STR_FILE_IDENTIFIER      "file_identifier"
-
 #define TOKEN_VALUE_POSITION           30
 
-struct SetupFileList
-{
-  char *token;
-  char *value;
-  struct SetupFileList *next;
-};
-
-struct TokenInfo
-{
-  int type;
-  void *value;
-  char *text;
-};
+#define MAX_COOKIE_LEN                 256
 
 
 /* ------------------------------------------------------------------------- */
 /* file functions                                                            */
 /* ------------------------------------------------------------------------- */
 
-/*
-int get_string_integer_value(char *);
-boolean get_string_boolean_value(char *);
-char *getFormattedSetupEntry(char *, char *);
-void freeSetupFileList(struct SetupFileList *);
-char *getTokenValue(struct SetupFileList *, char *);
-struct SetupFileList *loadSetupFileList(char *);
-void checkSetupFileListIdentifier(struct SetupFileList *, char *);
-*/
-
-char *getLevelClassDescription(struct LevelDirInfo *ldi)
+static char *getLevelClassDescription(TreeInfo *ldi)
 {
   int position = ldi->sort_priority / 100;
 
@@ -129,12 +98,6 @@ char *getLevelClassDescription(struct LevelDirInfo *ldi)
     return "Unknown Level Class";
 }
 
-/* for 'InitUserLevelDir()' */
-static void SaveUserLevelInfo();
-
-/* for 'SaveUserLevelInfo()' */
-static char *getSetupLine(struct TokenInfo *, char *, int);
-
 static char *getUserLevelDir(char *level_subdir)
 {
   static char *userlevel_dir = NULL;
@@ -144,7 +107,7 @@ static char *getUserLevelDir(char *level_subdir)
   if (userlevel_dir)
     free(userlevel_dir);
 
-  if (strlen(level_subdir) > 0)
+  if (level_subdir != NULL)
     userlevel_dir = getPath3(data_dir, userlevel_subdir, level_subdir);
   else
     userlevel_dir = getPath2(data_dir, userlevel_subdir);
@@ -161,7 +124,7 @@ static char *getTapeDir(char *level_subdir)
   if (tape_dir)
     free(tape_dir);
 
-  if (strlen(level_subdir) > 0)
+  if (level_subdir != NULL)
     tape_dir = getPath3(data_dir, tape_subdir, level_subdir);
   else
     tape_dir = getPath2(data_dir, tape_subdir);
@@ -178,7 +141,7 @@ static char *getScoreDir(char *level_subdir)
   if (score_dir)
     free(score_dir);
 
-  if (strlen(level_subdir) > 0)
+  if (level_subdir != NULL)
     score_dir = getPath3(data_dir, score_subdir, level_subdir);
   else
     score_dir = getPath2(data_dir, score_subdir);
@@ -195,7 +158,7 @@ static char *getLevelSetupDir(char *level_subdir)
   if (levelsetup_dir)
     free(levelsetup_dir);
 
-  if (strlen(level_subdir) > 0)
+  if (level_subdir != NULL)
     levelsetup_dir = getPath3(data_dir, levelsetup_subdir, level_subdir);
   else
     levelsetup_dir = getPath2(data_dir, levelsetup_subdir);
@@ -203,6 +166,57 @@ static char *getLevelSetupDir(char *level_subdir)
   return levelsetup_dir;
 }
 
+static char *getUserGraphicsDir(char *graphics_subdir)
+{
+  static char *usergraphics_dir = NULL;
+  char *data_dir = getUserDataDir();
+  char *usergraphics_subdir = GRAPHICS_DIRECTORY;
+
+  if (usergraphics_dir)
+    free(usergraphics_dir);
+
+  if (graphics_subdir != NULL)
+    usergraphics_dir = getPath3(data_dir, usergraphics_subdir,graphics_subdir);
+  else
+    usergraphics_dir = getPath2(data_dir, usergraphics_subdir);
+
+  return usergraphics_dir;
+}
+
+static char *getUserSoundsDir(char *sounds_subdir)
+{
+  static char *usersounds_dir = NULL;
+  char *data_dir = getUserDataDir();
+  char *usersounds_subdir = SOUNDS_DIRECTORY;
+
+  if (usersounds_dir)
+    free(usersounds_dir);
+
+  if (sounds_subdir != NULL)
+    usersounds_dir = getPath3(data_dir, usersounds_subdir,sounds_subdir);
+  else
+    usersounds_dir = getPath2(data_dir, usersounds_subdir);
+
+  return usersounds_dir;
+}
+
+static char *getUserMusicDir(char *music_subdir)
+{
+  static char *usermusic_dir = NULL;
+  char *data_dir = getUserDataDir();
+  char *usermusic_subdir = MUSIC_DIRECTORY;
+
+  if (usermusic_dir)
+    free(usermusic_dir);
+
+  if (music_subdir != NULL)
+    usermusic_dir = getPath3(data_dir, usermusic_subdir,music_subdir);
+  else
+    usermusic_dir = getPath2(data_dir, usermusic_subdir);
+
+  return usermusic_dir;
+}
+
 char *getLevelFilename(int nr)
 {
   static char *filename = NULL;
@@ -213,7 +227,7 @@ char *getLevelFilename(int nr)
 
   sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION);
   filename = getPath3((leveldir_current->user_defined ?
-                      getUserLevelDir("") :
+                      getUserLevelDir(NULL) :
                       options.level_directory),
                      leveldir_current->fullpath,
                      basename);
@@ -249,25 +263,86 @@ char *getScoreFilename(int nr)
   return filename;
 }
 
+char *getSetupFilename()
+{
+  static char *filename = NULL;
+
+  if (filename != NULL)
+    free(filename);
+
+  filename = getPath2(getSetupDir(), SETUP_FILENAME);
+
+  return filename;
+}
+
+static char *getImageBasename(char *basename)
+{
+  char *result = basename;
+
+#if defined(PLATFORM_MSDOS)
+  if (program.filename_prefix != NULL)
+  {
+    int prefix_len = strlen(program.filename_prefix);
+
+    if (strncmp(basename, program.filename_prefix, prefix_len) == 0)
+      result = &basename[prefix_len];
+  }
+#endif
+
+  return result;
+}
+
+char *getImageFilename(char *basename)
+{
+  static char *filename = NULL;
+
+  if (filename != NULL)
+    free(filename);
+
+  filename = getPath2(options.graphics_directory, getImageBasename(basename));
+
+  return filename;
+}
+
+char *getCustomImageFilename(char *basename)
+{
+#if 0
+  if (strcmp(basename, "RocksFont.pcx") == 0)
+  {
+    char *dir = options.graphics_directory;
+
+    printf("checking directory '%s' ...\n", dir);
+
+    /*
+    dir = getPath2(options.graphics_directory);
+    */
+  }
+#endif
+
+  return getImageFilename(basename);
+}
+
 void InitTapeDirectory(char *level_subdir)
 {
   createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE);
-  createDirectory(getTapeDir(""), "main tape", PERMS_PRIVATE);
+  createDirectory(getTapeDir(NULL), "main tape", PERMS_PRIVATE);
   createDirectory(getTapeDir(level_subdir), "level tape", PERMS_PRIVATE);
 }
 
 void InitScoreDirectory(char *level_subdir)
 {
-  createDirectory(getScoreDir(""), "main score", PERMS_PUBLIC);
+  createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC);
   createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC);
 }
 
+static void SaveUserLevelInfo();
+
 void InitUserLevelDirectory(char *level_subdir)
 {
   if (access(getUserLevelDir(level_subdir), F_OK) != 0)
   {
     createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE);
-    createDirectory(getUserLevelDir(""), "main user level", PERMS_PRIVATE);
+    createDirectory(getUserLevelDir(NULL), "main user level", PERMS_PRIVATE);
     createDirectory(getUserLevelDir(level_subdir), "user level",PERMS_PRIVATE);
 
     SaveUserLevelInfo();
@@ -277,7 +352,7 @@ void InitUserLevelDirectory(char *level_subdir)
 void InitLevelSetupDirectory(char *level_subdir)
 {
   createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE);
-  createDirectory(getLevelSetupDir(""), "main level setup", PERMS_PRIVATE);
+  createDirectory(getLevelSetupDir(NULL), "main level setup", PERMS_PRIVATE);
   createDirectory(getLevelSetupDir(level_subdir), "level setup",PERMS_PRIVATE);
 }
 
@@ -330,19 +405,18 @@ void WriteChunk_VERS(FILE *file, int file_version, int game_version)
 /* some functions to handle lists of level directories                       */
 /* ------------------------------------------------------------------------- */
 
-struct LevelDirInfo *newLevelDirInfo()
+TreeInfo *newTreeInfo()
 {
-  return checked_calloc(sizeof(struct LevelDirInfo));
+  return checked_calloc(sizeof(TreeInfo));
 }
 
-void pushLevelDirInfo(struct LevelDirInfo **node_first,
-                     struct LevelDirInfo *node_new)
+void pushTreeInfo(TreeInfo **node_first, TreeInfo *node_new)
 {
   node_new->next = *node_first;
   *node_first = node_new;
 }
 
-int numLevelDirInfo(struct LevelDirInfo *node)
+int numTreeInfo(TreeInfo *node)
 {
   int num = 0;
 
@@ -355,12 +429,12 @@ int numLevelDirInfo(struct LevelDirInfo *node)
   return num;
 }
 
-boolean validLevelSeries(struct LevelDirInfo *node)
+boolean validLevelSeries(TreeInfo *node)
 {
   return (node != NULL && !node->node_group && !node->parent_link);
 }
 
-struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *node)
+TreeInfo *getFirstValidLevelSeries(TreeInfo *node)
 {
   if (node == NULL)
   {
@@ -382,7 +456,7 @@ struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *node)
     return node;
 }
 
-struct LevelDirInfo *getLevelDirInfoFirstGroupEntry(struct LevelDirInfo *node)
+TreeInfo *getTreeInfoFirstGroupEntry(TreeInfo *node)
 {
   if (node == NULL)
     return NULL;
@@ -393,14 +467,14 @@ struct LevelDirInfo *getLevelDirInfoFirstGroupEntry(struct LevelDirInfo *node)
     return node->node_parent->node_group;
 }
 
-int numLevelDirInfoInGroup(struct LevelDirInfo *node)
+int numTreeInfoInGroup(TreeInfo *node)
 {
-  return numLevelDirInfo(getLevelDirInfoFirstGroupEntry(node));
+  return numTreeInfo(getTreeInfoFirstGroupEntry(node));
 }
 
-int posLevelDirInfo(struct LevelDirInfo *node)
+int posTreeInfo(TreeInfo *node)
 {
-  struct LevelDirInfo *node_cmp = getLevelDirInfoFirstGroupEntry(node);
+  TreeInfo *node_cmp = getTreeInfoFirstGroupEntry(node);
   int pos = 0;
 
   while (node_cmp)
@@ -415,9 +489,9 @@ int posLevelDirInfo(struct LevelDirInfo *node)
   return 0;
 }
 
-struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *node, int pos)
+TreeInfo *getTreeInfoFromPos(TreeInfo *node, int pos)
 {
-  struct LevelDirInfo *node_default = node;
+  TreeInfo *node_default = node;
   int pos_cmp = 0;
 
   while (node)
@@ -432,8 +506,7 @@ struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *node, int pos)
   return node_default;
 }
 
-struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node,
-                                                   char *filename)
+TreeInfo *getTreeInfoFromFilenameExt(TreeInfo *node, char *filename)
 {
   if (filename == NULL)
     return NULL;
@@ -442,9 +515,9 @@ struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node,
   {
     if (node->node_group)
     {
-      struct LevelDirInfo *node_group;
+      TreeInfo *node_group;
 
-      node_group = getLevelDirInfoFromFilenameExt(node->node_group, filename);
+      node_group = getTreeInfoFromFilenameExt(node->node_group, filename);
 
       if (node_group)
        return node_group;
@@ -461,12 +534,12 @@ struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node,
   return NULL;
 }
 
-struct LevelDirInfo *getLevelDirInfoFromFilename(char *filename)
+TreeInfo *getTreeInfoFromFilename(char *filename)
 {
-  return getLevelDirInfoFromFilenameExt(leveldir_first, filename);
+  return getTreeInfoFromFilenameExt(leveldir_first, filename);
 }
 
-void dumpLevelDirInfo(struct LevelDirInfo *node, int depth)
+void dumpTreeInfo(TreeInfo *node, int depth)
 {
   int i;
 
@@ -475,28 +548,28 @@ void dumpLevelDirInfo(struct LevelDirInfo *node, int depth)
     for (i=0; i<depth * 3; i++)
       printf(" ");
 
-    printf("filename == '%s'\n", node->filename);
+    printf("filename == '%s' [%s]\n", node->filename, node->name);
 
     if (node->node_group != NULL)
-      dumpLevelDirInfo(node->node_group, depth + 1);
+      dumpTreeInfo(node->node_group, depth + 1);
 
     node = node->next;
   }
 }
 
-void sortLevelDirInfo(struct LevelDirInfo **node_first,
-                     int (*compare_function)(const void *, const void *))
+void sortTreeInfo(TreeInfo **node_first,
+                 int (*compare_function)(const void *, const void *))
 {
-  int num_nodes = numLevelDirInfo(*node_first);
-  struct LevelDirInfo **sort_array;
-  struct LevelDirInfo *node = *node_first;
+  int num_nodes = numTreeInfo(*node_first);
+  TreeInfo **sort_array;
+  TreeInfo *node = *node_first;
   int i = 0;
 
   if (num_nodes == 0)
     return;
 
   /* allocate array for sorting structure pointers */
-  sort_array = checked_calloc(num_nodes * sizeof(struct LevelDirInfo *));
+  sort_array = checked_calloc(num_nodes * sizeof(TreeInfo *));
 
   /* writing structure pointers to sorting array */
   while (i < num_nodes && node)                /* double boundary check... */
@@ -508,7 +581,7 @@ void sortLevelDirInfo(struct LevelDirInfo **node_first,
   }
 
   /* sorting the structure pointers in the sorting array */
-  qsort(sort_array, num_nodes, sizeof(struct LevelDirInfo *),
+  qsort(sort_array, num_nodes, sizeof(TreeInfo *),
        compare_function);
 
   /* update the linkage of list elements with the sorted node array */
@@ -526,7 +599,7 @@ void sortLevelDirInfo(struct LevelDirInfo **node_first,
   while (node)
   {
     if (node->node_group != NULL)
-      sortLevelDirInfo(&node->node_group, compare_function);
+      sortTreeInfo(&node->node_group, compare_function);
 
     node = node->next;
   }
@@ -645,6 +718,21 @@ void SetFilePermissions(char *filename, int permission_class)
                   FILE_PERMS_PRIVATE : FILE_PERMS_PUBLIC));
 }
 
+char *getCookie(char *file_type)
+{
+  static char cookie[MAX_COOKIE_LEN + 1];
+
+  if (strlen(program.cookie_prefix) + 1 +
+      strlen(file_type) + strlen("_FILE_VERSION_x.x") > MAX_COOKIE_LEN)
+    return "[COOKIE ERROR]";   /* should never happen */
+
+  sprintf(cookie, "%s_%s_FILE_VERSION_%d.%d",
+         program.cookie_prefix, file_type,
+         program.version_major, program.version_minor);
+
+  return cookie;
+}
+
 int getFileVersionFromCookieString(const char *cookie)
 {
   const char *ptr_cookie1, *ptr_cookie2;
@@ -928,9 +1016,9 @@ void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
 
   if (strcmp(setup_file_list->token, TOKEN_STR_FILE_IDENTIFIER) == 0)
   {
-    if (strcmp(setup_file_list->value, identifier) != 0)
+    if (!checkCookieString(setup_file_list->value, identifier))
     {
-      Error(ERR_WARN, "configuration file has wrong version");
+      Error(ERR_WARN, "configuration file has wrong file identifier");
       return;
     }
     else
@@ -941,7 +1029,7 @@ void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
     checkSetupFileListIdentifier(setup_file_list->next, identifier);
   else
   {
-    Error(ERR_WARN, "configuration file has no version information");
+    Error(ERR_WARN, "configuration file has no file identifier");
     return;
   }
 }
@@ -954,41 +1042,6 @@ void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
 #define TOKEN_STR_LAST_LEVEL_SERIES    "last_level_series"
 #define TOKEN_STR_LAST_PLAYED_LEVEL    "last_played_level"
 #define TOKEN_STR_HANDICAP_LEVEL       "handicap_level"
-#define TOKEN_STR_PLAYER_PREFIX                "player_"
-
-/* global setup */
-#define SETUP_TOKEN_PLAYER_NAME                0
-#define SETUP_TOKEN_SOUND              1
-#define SETUP_TOKEN_SOUND_LOOPS                2
-#define SETUP_TOKEN_SOUND_MUSIC                3
-#define SETUP_TOKEN_SOUND_SIMPLE       4
-#define SETUP_TOKEN_SCROLL_DELAY       5
-#define SETUP_TOKEN_SOFT_SCROLLING     6
-#define SETUP_TOKEN_FADING             7
-#define SETUP_TOKEN_AUTORECORD         8
-#define SETUP_TOKEN_QUICK_DOORS                9
-#define SETUP_TOKEN_TEAM_MODE          10
-#define SETUP_TOKEN_HANDICAP           11
-#define SETUP_TOKEN_TIME_LIMIT         12
-#define SETUP_TOKEN_FULLSCREEN         13
-
-/* player setup */
-#define SETUP_TOKEN_USE_JOYSTICK       0
-#define SETUP_TOKEN_JOY_DEVICE_NAME    1
-#define SETUP_TOKEN_JOY_XLEFT          2
-#define SETUP_TOKEN_JOY_XMIDDLE                3
-#define SETUP_TOKEN_JOY_XRIGHT         4
-#define SETUP_TOKEN_JOY_YUPPER         5
-#define SETUP_TOKEN_JOY_YMIDDLE                6
-#define SETUP_TOKEN_JOY_YLOWER         7
-#define SETUP_TOKEN_JOY_SNAP           8
-#define SETUP_TOKEN_JOY_BOMB           9
-#define SETUP_TOKEN_KEY_LEFT           10
-#define SETUP_TOKEN_KEY_RIGHT          11
-#define SETUP_TOKEN_KEY_UP             12
-#define SETUP_TOKEN_KEY_DOWN           13
-#define SETUP_TOKEN_KEY_SNAP           14
-#define SETUP_TOKEN_KEY_BOMB           15
 
 /* level directory info */
 #define LEVELINFO_TOKEN_NAME           0
@@ -1002,75 +1055,36 @@ void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
 #define LEVELINFO_TOKEN_LEVEL_GROUP    8
 #define LEVELINFO_TOKEN_READONLY       9
 
-#define FIRST_GLOBAL_SETUP_TOKEN       SETUP_TOKEN_PLAYER_NAME
-#define LAST_GLOBAL_SETUP_TOKEN                SETUP_TOKEN_FULLSCREEN
-
-#define FIRST_PLAYER_SETUP_TOKEN       SETUP_TOKEN_USE_JOYSTICK
-#define LAST_PLAYER_SETUP_TOKEN                SETUP_TOKEN_KEY_BOMB
-
-#define FIRST_LEVELINFO_TOKEN          LEVELINFO_TOKEN_NAME
-#define LAST_LEVELINFO_TOKEN           LEVELINFO_TOKEN_READONLY
-
-static struct SetupInfo si;
-static struct SetupInputInfo sii;
-static struct LevelDirInfo ldi;
-static struct TokenInfo global_setup_tokens[] =
-{
-  /* global setup */
-  { TYPE_STRING,  &si.player_name,     "player_name"                   },
-  { 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.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_SWITCH,  &si.handicap,                "handicap"                      },
-  { TYPE_SWITCH,  &si.time_limit,      "time_limit"                    },
-  { TYPE_SWITCH,  &si.fullscreen,      "fullscreen"                    }
-};
+#define NUM_LEVELINFO_TOKENS           10
 
-static struct TokenInfo player_setup_tokens[] =
-{
-  /* player setup */
-  { 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_KEY,     &sii.key.left,       ".key.move_left"                },
-  { TYPE_KEY,     &sii.key.right,      ".key.move_right"               },
-  { TYPE_KEY,     &sii.key.up,         ".key.move_up"                  },
-  { TYPE_KEY,     &sii.key.down,       ".key.move_down"                },
-  { TYPE_KEY,     &sii.key.snap,       ".key.snap_field"               },
-  { TYPE_KEY,     &sii.key.bomb,       ".key.place_bomb"               }
-};
+static LevelDirTree ldi;
 
 static struct TokenInfo levelinfo_tokens[] =
 {
   /* 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"                      }
+  { 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"      }
 };
 
-static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi)
+static void setTreeInfoToDefaults(TreeInfo *ldi)
 {
+  ldi->node_parent = NULL;
+  ldi->node_group = NULL;
+  ldi->next = NULL;
+
+  ldi->cl_first = -1;
+  ldi->cl_cursor = -1;
+
+  ldi->type = TREE_TYPE_GENERIC;
+
   ldi->filename = NULL;
   ldi->fullpath = NULL;
   ldi->basepath = NULL;
@@ -1090,20 +1104,14 @@ static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi)
   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)
+static void setTreeInfoToDefaultsFromParent(TreeInfo *ldi,
+                                           TreeInfo *parent)
 {
   if (parent == NULL)
   {
-    setLevelDirInfoToDefaults(ldi);
+    setTreeInfoToDefaults(ldi);
     return;
   }
 
@@ -1134,52 +1142,8 @@ static void setLevelDirInfoToDefaultsFromParent(struct LevelDirInfo *ldi,
   ldi->next = NULL;
 }
 
-static void setSetupInfoToDefaults(struct SetupInfo *si)
-{
-  int i;
-
-  si->player_name = getStringCopy(getLoginName());
-
-  si->sound = TRUE;
-  si->sound_loops = TRUE;
-  si->sound_music = TRUE;
-  si->sound_simple = TRUE;
-  si->toons = TRUE;
-  si->double_buffering = TRUE;
-  si->direct_draw = !si->double_buffering;
-  si->scroll_delay = TRUE;
-  si->soft_scrolling = TRUE;
-  si->fading = FALSE;
-  si->autorecord = TRUE;
-  si->quick_doors = FALSE;
-  si->team_mode = FALSE;
-  si->handicap = TRUE;
-  si->time_limit = TRUE;
-  si->fullscreen = FALSE;
-
-  for (i=0; i<MAX_PLAYERS; i++)
-  {
-    si->input[i].use_joystick = FALSE;
-    si->input[i].joy.device_name=getStringCopy(getDeviceNameFromJoystickNr(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  : KSYM_UNDEFINED);
-    si->input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KSYM_UNDEFINED);
-    si->input[i].key.up    = (i == 0 ? DEFAULT_KEY_UP    : KSYM_UNDEFINED);
-    si->input[i].key.down  = (i == 0 ? DEFAULT_KEY_DOWN  : KSYM_UNDEFINED);
-    si->input[i].key.snap  = (i == 0 ? DEFAULT_KEY_SNAP  : KSYM_UNDEFINED);
-    si->input[i].key.bomb  = (i == 0 ? DEFAULT_KEY_BOMB  : KSYM_UNDEFINED);
-  }
-}
-
-static void setSetupInfo(struct TokenInfo *token_info,
-                        int token_nr, char *token_value)
+void setSetupInfo(struct TokenInfo *token_info,
+                 int token_nr, char *token_value)
 {
   int token_type = token_info[token_nr].type;
   void *setup_value = token_info[token_nr].value;
@@ -1196,6 +1160,10 @@ static void setSetupInfo(struct TokenInfo *token_info,
       break;
 
     case TYPE_KEY:
+      *(Key *)setup_value = getKeyFromKeyName(token_value);
+      break;
+
+    case TYPE_KEY_X11:
       *(Key *)setup_value = getKeyFromX11KeyName(token_value);
       break;
 
@@ -1214,44 +1182,10 @@ static void setSetupInfo(struct TokenInfo *token_info,
   }
 }
 
-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(global_setup_tokens, i,
-                getTokenValue(setup_file_list, global_setup_tokens[i].text));
-  setup = si;
-
-  /* handle player specific setup values */
-  for (pnr=0; pnr<MAX_PLAYERS; pnr++)
-  {
-    char prefix[30];
-
-    sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, pnr + 1);
-
-    sii = setup.input[pnr];
-    for (i=FIRST_PLAYER_SETUP_TOKEN; i<=LAST_PLAYER_SETUP_TOKEN; i++)
-    {
-      char full_token[100];
-
-      sprintf(full_token, "%s%s", prefix, player_setup_tokens[i].text);
-      setSetupInfo(player_setup_tokens, i,
-                  getTokenValue(setup_file_list, full_token));
-    }
-    setup.input[pnr] = sii;
-  }
-}
-
-static int compareLevelDirInfoEntries(const void *object1, const void *object2)
+static int compareTreeInfoEntries(const void *object1, const void *object2)
 {
-  const struct LevelDirInfo *entry1 = *((struct LevelDirInfo **)object1);
-  const struct LevelDirInfo *entry2 = *((struct LevelDirInfo **)object2);
+  const TreeInfo *entry1 = *((TreeInfo **)object1);
+  const TreeInfo *entry2 = *((TreeInfo **)object2);
   int compare_result;
 
   if (entry1->parent_link || entry2->parent_link)
@@ -1274,11 +1208,11 @@ static int compareLevelDirInfoEntries(const void *object1, const void *object2)
   return compare_result;
 }
 
-static void createParentLevelDirNode(struct LevelDirInfo *node_parent)
+static void createParentTreeInfoNode(TreeInfo *node_parent)
 {
-  struct LevelDirInfo *leveldir_new = newLevelDirInfo();
+  TreeInfo *leveldir_new = newTreeInfo();
 
-  setLevelDirInfoToDefaults(leveldir_new);
+  setTreeInfoToDefaults(leveldir_new);
 
   leveldir_new->node_parent = node_parent;
   leveldir_new->parent_link = TRUE;
@@ -1293,11 +1227,105 @@ static void createParentLevelDirNode(struct LevelDirInfo *node_parent)
   leveldir_new->sort_priority = node_parent->sort_priority;
   leveldir_new->class_desc = getLevelClassDescription(leveldir_new);
 
-  pushLevelDirInfo(&node_parent->node_group, leveldir_new);
+  pushTreeInfo(&node_parent->node_group, leveldir_new);
+}
+
+/* forward declaration for recursive call by "LoadLevelInfoFromLevelDir()" */
+static void LoadLevelInfoFromLevelDir(TreeInfo **, TreeInfo *, char *);
+
+static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first,
+                                         TreeInfo *node_parent,
+                                         char *level_directory,
+                                         char *directory_name)
+{
+  char *directory_path = getPath2(level_directory, directory_name);
+  char *filename = getPath2(directory_path, LEVELINFO_FILENAME);
+  struct SetupFileList *setup_file_list = loadSetupFileList(filename);
+  LevelDirTree *leveldir_new = NULL;
+  int i;
+
+  if (setup_file_list == NULL)
+  {
+    Error(ERR_WARN, "ignoring level directory '%s'", level_directory);
+
+    free(directory_path);
+    free(filename);
+
+    return FALSE;
+  }
+
+  leveldir_new = newTreeInfo();
+
+  checkSetupFileListIdentifier(setup_file_list, getCookie("LEVELINFO"));
+  setTreeInfoToDefaultsFromParent(leveldir_new, node_parent);
+
+  /* set all structure fields according to the token/value pairs */
+  ldi = *leveldir_new;
+  for (i=0; i<NUM_LEVELINFO_TOKENS; i++)
+    setSetupInfo(levelinfo_tokens, i,
+                getTokenValue(setup_file_list, levelinfo_tokens[i].text));
+  *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);
+
+  pushTreeInfo(node_first, leveldir_new);
+
+  freeSetupFileList(setup_file_list);
+
+  if (leveldir_new->level_group)
+  {
+    /* create node to link back to current level directory */
+    createParentTreeInfoNode(leveldir_new);
+
+    /* step into sub-directory and look for more level series */
+    LoadLevelInfoFromLevelDir(&leveldir_new->node_group,
+                             leveldir_new, directory_path);
+  }
+
+  free(directory_path);
+  free(filename);
+
+  return TRUE;
 }
 
-static void LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first,
-                                     struct LevelDirInfo *node_parent,
+static void LoadLevelInfoFromLevelDir(TreeInfo **node_first,
+                                     TreeInfo *node_parent,
                                      char *level_directory)
 {
   DIR *dir;
@@ -1312,11 +1340,9 @@ static void LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first,
 
   while ((dir_entry = readdir(dir)) != NULL)   /* loop until last dir entry */
   {
-    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(directory_name, ".")  == 0 ||
@@ -1334,110 +1360,278 @@ static void LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first,
       continue;
     }
 
-    filename = getPath2(directory_path, LEVELINFO_FILENAME);
-    setup_file_list = loadSetupFileList(filename);
+    free(directory_path);
 
-    if (setup_file_list)
-    {
-      struct LevelDirInfo *leveldir_new = newLevelDirInfo();
-      int i;
+    valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent,
+                                                   level_directory,
+                                                   directory_name);
+  }
 
-      checkSetupFileListIdentifier(setup_file_list, LEVELINFO_COOKIE);
-      setLevelDirInfoToDefaultsFromParent(leveldir_new, node_parent);
+  closedir(dir);
 
-      /* set all structure fields according to the token/value pairs */
-      ldi = *leveldir_new;
-      for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++)
-       setSetupInfo(levelinfo_tokens, i,
-                    getTokenValue(setup_file_list, levelinfo_tokens[i].text));
-      *leveldir_new = ldi;
+  if (!valid_entry_found)
+  {
+    /* check if this directory directly contains a file "levelinfo.conf" */
+    valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent,
+                                                   level_directory, ".");
+  }
 
-      DrawInitText(leveldir_new->name, 150, FC_YELLOW);
+  if (!valid_entry_found)
+    Error(ERR_WARN, "cannot find any valid level series in directory '%s'",
+         level_directory);
+}
 
-      if (leveldir_new->name_short == NULL)
-       leveldir_new->name_short = getStringCopy(leveldir_new->name);
+void LoadLevelInfo()
+{
+  InitUserLevelDirectory(getLoginName());
 
-      if (leveldir_new->name_sorting == NULL)
-       leveldir_new->name_sorting = getStringCopy(leveldir_new->name);
+  DrawInitText("Loading level series:", 120, FC_GREEN);
 
-      leveldir_new->filename = getStringCopy(directory_name);
+  LoadLevelInfoFromLevelDir(&leveldir_first, NULL, options.level_directory);
+  LoadLevelInfoFromLevelDir(&leveldir_first, NULL, getUserLevelDir(NULL));
 
-      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);
-      }
+  leveldir_current = getFirstValidLevelSeries(leveldir_first);
 
-      if (leveldir_new->levels < 1)
-       leveldir_new->levels = 1;
+  if (leveldir_first == NULL)
+    Error(ERR_EXIT, "cannot find any valid level series in any directory");
 
-      leveldir_new->last_level =
-       leveldir_new->first_level + leveldir_new->levels - 1;
+  sortTreeInfo(&leveldir_first, compareTreeInfoEntries);
 
-      leveldir_new->user_defined =
-       (leveldir_new->basepath == options.level_directory ? FALSE : TRUE);
+#if 0
+  dumpTreeInfo(leveldir_first, 0);
+#endif
+}
 
-      leveldir_new->color = LEVELCOLOR(leveldir_new);
-      leveldir_new->class_desc = getLevelClassDescription(leveldir_new);
+/* declaration for recursive call by "LoadArtworkInfoFromArtworkConf()" */
+static void LoadArtworkInfoFromArtworkDir(TreeInfo **, TreeInfo *, char *,int);
 
-      leveldir_new->handicap_level =   /* set handicap to default value */
-       (leveldir_new->user_defined ?
-        leveldir_new->last_level :
-        leveldir_new->first_level);
+static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first,
+                                             TreeInfo *node_parent,
+                                             char *base_directory,
+                                             char *directory_name, int type)
+{
+  char *directory_path = getPath2(base_directory, directory_name);
+  char *filename =
+    getPath2(directory_path,
+            (type == TREE_TYPE_GRAPHICS_DIR ? GRAPHICSINFO_FILENAME :
+             type == TREE_TYPE_SOUNDS_DIR ? SOUNDSINFO_FILENAME :
+             type == TREE_TYPE_MUSIC_DIR ? MUSICINFO_FILENAME : ""));
+  struct SetupFileList *setup_file_list = NULL;
+  TreeInfo *artwork_new = NULL;
+  char *check_dir = NULL;
+  int i;
 
-      pushLevelDirInfo(node_first, leveldir_new);
+  if (access(getUserLevelDir(filename), F_OK) == 0)    /* file exists */
+    loadSetupFileList(filename);
 
-      freeSetupFileList(setup_file_list);
-      valid_entry_found = TRUE;
+  if (setup_file_list == NULL) /* no config file -- look for artwork files */
+  {
+    DIR *dir;
+    struct dirent *dir_entry;
+    boolean valid_file_found = FALSE;
 
-      if (leveldir_new->level_group)
+    if ((dir = opendir(base_directory)) != NULL)
+    {
+      while ((dir_entry = readdir(dir)) != NULL)
       {
-       /* create node to link back to current level directory */
-       createParentLevelDirNode(leveldir_new);
+       char *entry_name = dir_entry->d_name;
 
-       /* step into sub-directory and look for more level series */
-       LoadLevelInfoFromLevelDir(&leveldir_new->node_group,
-                                 leveldir_new, directory_path);
+       if ((type == TREE_TYPE_GRAPHICS_DIR && FileIsGraphic(entry_name)) ||
+           (type == TREE_TYPE_SOUNDS_DIR && FileIsSound(entry_name)) ||
+           (type == TREE_TYPE_MUSIC_DIR && FileIsMusic(entry_name)))
+       {
+         valid_file_found = TRUE;
+         break;
+       }
       }
+
+      closedir(dir);
+    }
+
+    if (!valid_file_found)
+    {
+      Error(ERR_WARN, "ignoring artwork directory '%s'", base_directory);
+
+      free(directory_path);
+      free(filename);
+
+      return FALSE;
     }
+  }
+
+  artwork_new = newTreeInfo();
+  setTreeInfoToDefaultsFromParent(artwork_new, node_parent);
+
+  artwork_new->filename = getStringCopy(directory_name);
+
+  if (setup_file_list)
+  {
+#if 0
+    checkSetupFileListIdentifier(setup_file_list, getCookie("..."));
+#endif
+
+    /* set all structure fields according to the token/value pairs */
+    ldi = *artwork_new;
+    for (i=0; i<NUM_LEVELINFO_TOKENS; i++)
+      setSetupInfo(levelinfo_tokens, i,
+                  getTokenValue(setup_file_list, levelinfo_tokens[i].text));
+    *artwork_new = ldi;
+
+    DrawInitText(artwork_new->name, 150, FC_YELLOW);
+
+    if (artwork_new->name_short == NULL)
+      artwork_new->name_short = getStringCopy(artwork_new->name);
+
+    if (artwork_new->name_sorting == NULL)
+      artwork_new->name_sorting = getStringCopy(artwork_new->name);
+  }
+  else
+  {
+    if (artwork_new->name != NULL)
+      free(artwork_new->name);
+
+    if (strcmp(artwork_new->filename, ".") == 0)
+      artwork_new->name = getStringCopy("default");
     else
-      Error(ERR_WARN, "ignoring level directory '%s'", directory_path);
+      artwork_new->name = getStringCopy(artwork_new->filename);
+
+    artwork_new->name_short = getStringCopy(artwork_new->name);
+    artwork_new->name_sorting = getStringCopy(artwork_new->name);
+  }
+
+  if (node_parent == NULL)             /* top level group */
+  {
+    artwork_new->basepath = base_directory;
+    artwork_new->fullpath = artwork_new->filename;
+  }
+  else                                 /* sub level group */
+  {
+    artwork_new->basepath = node_parent->basepath;
+    artwork_new->fullpath = getPath2(node_parent->fullpath, directory_name);
+  }
+
+  check_dir = (type == TREE_TYPE_GRAPHICS_DIR ? options.graphics_directory :
+              type == TREE_TYPE_SOUNDS_DIR ? options.sounds_directory :
+              type == TREE_TYPE_MUSIC_DIR ? options.music_directory : "");
+  artwork_new->user_defined =
+    (artwork_new->basepath == check_dir ? FALSE : TRUE);
+
+#if 0
+  artwork_new->color = LEVELCOLOR(artwork_new);
+  artwork_new->class_desc = getLevelClassDescription(artwork_new);
+#endif
+
+  pushTreeInfo(node_first, artwork_new);
+
+  freeSetupFileList(setup_file_list);
+
+  free(directory_path);
+  free(filename);
+
+  return TRUE;
+}
+
+static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first,
+                                         TreeInfo *node_parent,
+                                         char *base_directory, int type)
+{
+  DIR *dir;
+  struct dirent *dir_entry;
+  boolean valid_entry_found = FALSE;
+
+  if ((dir = opendir(base_directory)) == NULL)
+  {
+    if ((type == TREE_TYPE_GRAPHICS_DIR &&
+        base_directory == options.graphics_directory) ||
+       (type == TREE_TYPE_SOUNDS_DIR &&
+        base_directory == options.sounds_directory) ||
+       (type == TREE_TYPE_MUSIC_DIR &&
+        base_directory == options.music_directory))
+      Error(ERR_WARN, "cannot read directory '%s'", base_directory);
+    return;
+  }
+
+  while ((dir_entry = readdir(dir)) != NULL)   /* loop until last dir entry */
+  {
+    struct stat file_status;
+    char *directory_name = dir_entry->d_name;
+    char *directory_path = getPath2(base_directory, directory_name);
+
+    /* skip entries for current and parent directory */
+    if (strcmp(directory_name, ".")  == 0 ||
+       strcmp(directory_name, "..") == 0)
+    {
+      free(directory_path);
+      continue;
+    }
+
+    /* find out if directory entry is itself a directory */
+    if (stat(directory_path, &file_status) != 0 ||     /* cannot stat file */
+       (file_status.st_mode & S_IFMT) != S_IFDIR)      /* not a directory */
+    {
+      free(directory_path);
+      continue;
+    }
 
     free(directory_path);
-    free(filename);
+
+    valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first,node_parent,
+                                                       base_directory,
+                                                       directory_name, type);
   }
 
   closedir(dir);
 
   if (!valid_entry_found)
-    Error(ERR_WARN, "cannot find any valid level series in directory '%s'",
-         level_directory);
+  {
+    /* check if this directory directly contains an artwork config file */
+    valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first,node_parent,
+                                                       base_directory, ".",
+                                                       type);
+  }
+
+  if (!valid_entry_found)
+    Error(ERR_WARN, "cannot find any valid artwork in directory '%s'",
+         base_directory);
 }
 
-void LoadLevelInfo()
+void LoadArtworkInfo()
 {
-  InitUserLevelDirectory(getLoginName());
+  DrawInitText("Looking for custom artwork:", 120, FC_GREEN);
 
-  DrawInitText("Loading level series:", 120, FC_GREEN);
+  LoadArtworkInfoFromArtworkDir(&artwork.gfx_first, NULL,
+                               options.graphics_directory,
+                               TREE_TYPE_GRAPHICS_DIR);
+  LoadArtworkInfoFromArtworkDir(&artwork.gfx_first, NULL,
+                               getUserGraphicsDir(NULL),
+                               TREE_TYPE_GRAPHICS_DIR);
 
-  LoadLevelInfoFromLevelDir(&leveldir_first, NULL, options.level_directory);
-  LoadLevelInfoFromLevelDir(&leveldir_first, NULL, getUserLevelDir(""));
+  LoadArtworkInfoFromArtworkDir(&artwork.snd_first, NULL,
+                               options.sounds_directory,
+                               TREE_TYPE_SOUNDS_DIR);
+  LoadArtworkInfoFromArtworkDir(&artwork.snd_first, NULL,
+                               getUserSoundsDir(NULL),
+                               TREE_TYPE_SOUNDS_DIR);
 
-  leveldir_current = getFirstValidLevelSeries(leveldir_first);
+  LoadArtworkInfoFromArtworkDir(&artwork.mus_first, NULL,
+                               options.music_directory,
+                               TREE_TYPE_MUSIC_DIR);
+  LoadArtworkInfoFromArtworkDir(&artwork.mus_first, NULL,
+                               getUserMusicDir(NULL),
+                               TREE_TYPE_MUSIC_DIR);
 
-  if (leveldir_first == NULL)
-    Error(ERR_EXIT, "cannot find any valid level series in any directory");
+  artwork.gfx_current = artwork.gfx_first;
+  artwork.snd_current = artwork.snd_first;
+  artwork.mus_current = artwork.mus_first;
 
-  sortLevelDirInfo(&leveldir_first, compareLevelDirInfoEntries);
+  sortTreeInfo(&artwork.gfx_first, compareTreeInfoEntries);
+  sortTreeInfo(&artwork.snd_first, compareTreeInfoEntries);
+  sortTreeInfo(&artwork.mus_first, compareTreeInfoEntries);
 
 #if 0
-  dumpLevelDirInfo(leveldir_first, 0);
+  dumpTreeInfo(artwork.gfx_first, 0);
+  dumpTreeInfo(artwork.snd_first, 0);
+  dumpTreeInfo(artwork.mus_first, 0);
 #endif
 }
 
@@ -1457,7 +1651,7 @@ static void SaveUserLevelInfo()
   }
 
   /* always start with reliable default values */
-  setLevelDirInfoToDefaults(&ldi);
+  setTreeInfoToDefaults(&ldi);
 
   ldi.name = getLoginName();
   ldi.author = getRealName();
@@ -1466,10 +1660,10 @@ static void SaveUserLevelInfo()
   ldi.sort_priority = LEVELCLASS_USER_START;
   ldi.readonly = FALSE;
 
-  fprintf(file, "%s\n\n",
-         getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, LEVELINFO_COOKIE));
+  fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
+                                                getCookie("LEVELINFO")));
 
-  for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++)
+  for (i=0; i<NUM_LEVELINFO_TOKENS; i++)
     if (i != LEVELINFO_TOKEN_NAME_SHORT &&
        i != LEVELINFO_TOKEN_NAME_SORTING &&
        i != LEVELINFO_TOKEN_IMPORTED_FROM)
@@ -1481,158 +1675,83 @@ static void SaveUserLevelInfo()
   SetFilePermissions(filename, PERMS_PRIVATE);
 }
 
-void LoadSetup()
-{
-  char *filename;
-  struct SetupFileList *setup_file_list = NULL;
-
-  /* always start with reliable default values */
-  setSetupInfoToDefaults(&setup);
-
-  filename = getPath2(getSetupDir(), SETUP_FILENAME);
-
-  setup_file_list = loadSetupFileList(filename);
-
-  if (setup_file_list)
-  {
-    checkSetupFileListIdentifier(setup_file_list, SETUP_COOKIE);
-    decodeSetupFileList(setup_file_list);
-
-    setup.direct_draw = !setup.double_buffering;
-
-    freeSetupFileList(setup_file_list);
-
-    /* needed to work around problems with fixed length strings */
-    if (strlen(setup.player_name) > MAX_PLAYER_NAME_LEN)
-      setup.player_name[MAX_PLAYER_NAME_LEN] = '\0';
-    else if (strlen(setup.player_name) < MAX_PLAYER_NAME_LEN)
-    {
-      char *new_name = checked_malloc(MAX_PLAYER_NAME_LEN + 1);
-
-      strcpy(new_name, setup.player_name);
-      free(setup.player_name);
-      setup.player_name = new_name;
-    }
-  }
-  else
-    Error(ERR_WARN, "using default setup values");
-
-  free(filename);
-}
-
-static char *getSetupLine(struct TokenInfo *token_info,
-                         char *prefix, int token_nr)
+char *getSetupValue(int type, void *value)
 {
-  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;
+  static char value_string[MAX_LINE_LEN];
 
-  /* 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)
+  switch (type)
   {
     case TYPE_BOOLEAN:
-      strcat(entry, (*(boolean *)setup_value ? "true" : "false"));
+      strcpy(value_string, (*(boolean *)value ? "true" : "false"));
       break;
 
     case TYPE_SWITCH:
-      strcat(entry, (*(boolean *)setup_value ? "on" : "off"));
+      strcpy(value_string, (*(boolean *)value ? "on" : "off"));
       break;
 
-    case TYPE_KEY:
-      {
-       Key key = *(Key *)setup_value;
-       char *keyname = getKeyNameFromKey(key);
+    case TYPE_YES_NO:
+      strcpy(value_string, (*(boolean *)value ? "yes" : "no"));
+      break;
 
-       strcat(entry, getX11KeyNameFromKey(key));
-       for (i=strlen(entry); i<50; i++)
-         strcat(entry, " ");
+    case TYPE_KEY:
+      strcpy(value_string, getKeyNameFromKey(*(Key *)value));
+      break;
 
-       /* add comment, if useful */
-       if (strcmp(keyname, "(undefined)") != 0 &&
-           strcmp(keyname, "(unknown)") != 0)
-       {
-         strcat(entry, "# ");
-         strcat(entry, keyname);
-       }
-      }
+    case TYPE_KEY_X11:
+      strcpy(value_string, getX11KeyNameFromKey(*(Key *)value));
       break;
 
     case TYPE_INTEGER:
-      {
-       char buffer[MAX_LINE_LEN];
-
-       sprintf(buffer, "%d", *(int *)setup_value);
-       strcat(entry, buffer);
-      }
+      sprintf(value_string, "%d", *(int *)value);
       break;
 
     case TYPE_STRING:
-      strcat(entry, *(char **)setup_value);
+      strcpy(value_string, *(char **)value);
       break;
 
     default:
+      value_string[0] = '\0';
       break;
   }
 
-  return entry;
+  return value_string;
 }
 
-void SaveSetup()
+char *getSetupLine(struct TokenInfo *token_info, char *prefix, int token_nr)
 {
-  int i, pnr;
-  char *filename;
-  FILE *file;
-
-  InitUserDataDirectory();
-
-  filename = getPath2(getSetupDir(), SETUP_FILENAME);
-
-  if (!(file = fopen(filename, MODE_WRITE)))
-  {
-    Error(ERR_WARN, "cannot write setup file '%s'", filename);
-    free(filename);
-    return;
-  }
-
-  fprintf(file, "%s\n",
-         getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, SETUP_COOKIE));
-  fprintf(file, "\n");
+  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;
+  char *value_string = getSetupValue(token_type, setup_value);
 
-  /* handle global setup values */
-  si = setup;
-  for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++)
-  {
-    fprintf(file, "%s\n", getSetupLine(global_setup_tokens, "", i));
+  /* 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, " ");
 
-    /* just to make things nicer :) */
-    if (i == SETUP_TOKEN_PLAYER_NAME)
-      fprintf(file, "\n");
-  }
+  /* continue with the token's value (which can have different types) */
+  strcat(entry, value_string);
 
-  /* handle player specific setup values */
-  for (pnr=0; pnr<MAX_PLAYERS; pnr++)
+  if (token_type == TYPE_KEY_X11)
   {
-    char prefix[30];
+    Key key = *(Key *)setup_value;
+    char *keyname = getKeyNameFromKey(key);
 
-    sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, pnr + 1);
-    fprintf(file, "\n");
+    /* add comment, if useful */
+    if (strcmp(keyname, "(undefined)") != 0 &&
+       strcmp(keyname, "(unknown)") != 0)
+    {
+      for (i=strlen(entry); i<50; i++)
+       strcat(entry, " ");
 
-    sii = setup.input[pnr];
-    for (i=FIRST_PLAYER_SETUP_TOKEN; i<=LAST_PLAYER_SETUP_TOKEN; i++)
-      fprintf(file, "%s\n", getSetupLine(player_setup_tokens, prefix, i));
+      strcat(entry, "# ");
+      strcat(entry, keyname);
+    }
   }
 
-  fclose(file);
-  free(filename);
-
-  SetFilePermissions(filename, PERMS_PRIVATE);
+  return entry;
 }
 
 void LoadLevelSetup_LastSeries()
@@ -1644,7 +1763,7 @@ void LoadLevelSetup_LastSeries()
   leveldir_current = getFirstValidLevelSeries(leveldir_first);
 
   /* ----------------------------------------------------------------------- */
-  /* ~/.rocksndiamonds/levelsetup.conf                                       */
+  /* ~/.<program>/levelsetup.conf                                            */
   /* ----------------------------------------------------------------------- */
 
   filename = getPath2(getSetupDir(), LEVELSETUP_FILENAME);
@@ -1654,11 +1773,11 @@ void LoadLevelSetup_LastSeries()
     char *last_level_series =
       getTokenValue(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES);
 
-    leveldir_current = getLevelDirInfoFromFilename(last_level_series);
+    leveldir_current = getTreeInfoFromFilename(last_level_series);
     if (leveldir_current == NULL)
       leveldir_current = leveldir_first;
 
-    checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
+    checkSetupFileListIdentifier(level_setup_list, getCookie("LEVELSETUP"));
 
     freeSetupFileList(level_setup_list);
   }
@@ -1675,7 +1794,7 @@ void SaveLevelSetup_LastSeries()
   FILE *file;
 
   /* ----------------------------------------------------------------------- */
-  /* ~/.rocksndiamonds/levelsetup.conf                                       */
+  /* ~/.<program>/levelsetup.conf                                            */
   /* ----------------------------------------------------------------------- */
 
   InitUserDataDirectory();
@@ -1690,7 +1809,7 @@ void SaveLevelSetup_LastSeries()
   }
 
   fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
-                                                LEVELSETUP_COOKIE));
+                                                getCookie("LEVELSETUP")));
   fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_LAST_LEVEL_SERIES,
                                               level_subdir));
 
@@ -1709,7 +1828,7 @@ static void checkSeriesInfo()
   /* check for more levels besides the 'levels' field of 'levelinfo.conf' */
 
   level_directory = getPath2((leveldir_current->user_defined ?
-                             getUserLevelDir("") :
+                             getUserLevelDir(NULL) :
                              options.level_directory),
                             leveldir_current->fullpath);
 
@@ -1761,7 +1880,7 @@ void LoadLevelSetup_SeriesInfo()
   checkSeriesInfo(leveldir_current);
 
   /* ----------------------------------------------------------------------- */
-  /* ~/.rocksndiamonds/levelsetup/<level series>/levelsetup.conf             */
+  /* ~/.<program>/levelsetup/<level series>/levelsetup.conf                  */
   /* ----------------------------------------------------------------------- */
 
   level_subdir = leveldir_current->filename;
@@ -1801,7 +1920,7 @@ void LoadLevelSetup_SeriesInfo()
       leveldir_current->handicap_level = level_nr;
     }
 
-    checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
+    checkSetupFileListIdentifier(level_setup_list, getCookie("LEVELSETUP"));
 
     freeSetupFileList(level_setup_list);
   }
@@ -1820,7 +1939,7 @@ void SaveLevelSetup_SeriesInfo()
   FILE *file;
 
   /* ----------------------------------------------------------------------- */
-  /* ~/.rocksndiamonds/levelsetup/<level series>/levelsetup.conf             */
+  /* ~/.<program>/levelsetup/<level series>/levelsetup.conf                  */
   /* ----------------------------------------------------------------------- */
 
   InitLevelSetupDirectory(level_subdir);
@@ -1835,7 +1954,7 @@ void SaveLevelSetup_SeriesInfo()
   }
 
   fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
-                                                LEVELSETUP_COOKIE));
+                                                getCookie("LEVELSETUP")));
   fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_LAST_PLAYED_LEVEL,
                                               level_nr_str));
   fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_HANDICAP_LEVEL,