X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=b7c59ffd41fafc479eb145f6be0f2d5627af46b7;hp=62a8322a78ade618840ef4cd0d3a13ee30945376;hb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;hpb=3a3108d045227e21342a915ffc7e022e8eecbedc

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 62a8322a..b7c59ffd 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -31,6 +31,7 @@
 
 
 #define ENABLE_UNUSED_CODE	FALSE	/* for currently unused functions */
+#define DEBUG_NO_CONFIG_FILE	FALSE	/* for extra-verbose debug output */
 
 #define NUM_LEVELCLASS_DESC	8
 
@@ -114,22 +115,6 @@ static char *getLevelClassDescription(TreeInfo *ti)
     return "Unknown Level Class";
 }
 
-static char *getUserLevelDir(char *level_subdir)
-{
-  static char *userlevel_dir = NULL;
-  char *data_dir = getUserGameDataDir();
-  char *userlevel_subdir = LEVELS_DIRECTORY;
-
-  checked_free(userlevel_dir);
-
-  if (level_subdir != NULL)
-    userlevel_dir = getPath3(data_dir, userlevel_subdir, level_subdir);
-  else
-    userlevel_dir = getPath2(data_dir, userlevel_subdir);
-
-  return userlevel_dir;
-}
-
 static char *getScoreDir(char *level_subdir)
 {
   static char *score_dir = NULL;
@@ -172,7 +157,7 @@ static char *getLevelSetupDir(char *level_subdir)
   return levelsetup_dir;
 }
 
-static char *getCacheDir()
+static char *getCacheDir(void)
 {
   static char *cache_dir = NULL;
 
@@ -182,6 +167,16 @@ static char *getCacheDir()
   return cache_dir;
 }
 
+static char *getNetworkDir(void)
+{
+  static char *network_dir = NULL;
+
+  if (network_dir == NULL)
+    network_dir = getPath2(getUserGameDataDir(), NETWORK_DIRECTORY);
+
+  return network_dir;
+}
+
 static char *getLevelDirFromTreeInfo(TreeInfo *node)
 {
   static char *level_dir = NULL;
@@ -197,12 +192,44 @@ static char *getLevelDirFromTreeInfo(TreeInfo *node)
   return level_dir;
 }
 
-char *getCurrentLevelDir()
+char *getUserLevelDir(char *level_subdir)
+{
+  static char *userlevel_dir = NULL;
+  char *data_dir = getUserGameDataDir();
+  char *userlevel_subdir = LEVELS_DIRECTORY;
+
+  checked_free(userlevel_dir);
+
+  if (level_subdir != NULL)
+    userlevel_dir = getPath3(data_dir, userlevel_subdir, level_subdir);
+  else
+    userlevel_dir = getPath2(data_dir, userlevel_subdir);
+
+  return userlevel_dir;
+}
+
+char *getNetworkLevelDir(char *level_subdir)
+{
+  static char *network_level_dir = NULL;
+  char *data_dir = getNetworkDir();
+  char *networklevel_subdir = LEVELS_DIRECTORY;
+
+  checked_free(network_level_dir);
+
+  if (level_subdir != NULL)
+    network_level_dir = getPath3(data_dir, networklevel_subdir, level_subdir);
+  else
+    network_level_dir = getPath2(data_dir, networklevel_subdir);
+
+  return network_level_dir;
+}
+
+char *getCurrentLevelDir(void)
 {
   return getLevelDirFromTreeInfo(leveldir_current);
 }
 
-char *getNewUserLevelSubdir()
+char *getNewUserLevelSubdir(void)
 {
   static char *new_level_subdir = NULL;
   char *subdir_prefix = getLoginName();
@@ -240,7 +267,7 @@ static char *getTapeDir(char *level_subdir)
   return tape_dir;
 }
 
-static char *getSolutionTapeDir()
+static char *getSolutionTapeDir(void)
 {
   static char *tape_dir = NULL;
   char *data_dir = getCurrentLevelDir();
@@ -312,7 +339,7 @@ static char *getClassicArtworkDir(int type)
 	  getDefaultMusicDir(MUS_CLASSIC_SUBDIR) : "");
 }
 
-static char *getUserGraphicsDir()
+static char *getUserGraphicsDir(void)
 {
   static char *usergraphics_dir = NULL;
 
@@ -322,7 +349,7 @@ static char *getUserGraphicsDir()
   return usergraphics_dir;
 }
 
-static char *getUserSoundsDir()
+static char *getUserSoundsDir(void)
 {
   static char *usersounds_dir = NULL;
 
@@ -332,7 +359,7 @@ static char *getUserSoundsDir()
   return usersounds_dir;
 }
 
-static char *getUserMusicDir()
+static char *getUserMusicDir(void)
 {
   static char *usermusic_dir = NULL;
 
@@ -425,27 +452,74 @@ inline static char *getLevelArtworkDir(int type)
   return LEVELDIR_ARTWORK_PATH(leveldir_current, type);
 }
 
-char *getProgramConfigFilename(char *command_filename_ptr)
+char *getProgramMainDataPath(char *command_filename, char *base_path)
 {
-  char *command_filename_1 = getStringCopy(command_filename_ptr);
+  /* check if the program's main data base directory is configured */
+  if (!strEqual(base_path, "."))
+    return base_path;
+
+  /* if the program is configured to start from current directory (default),
+     determine program package directory from program binary (some versions
+     of KDE/Konqueror and Mac OS X (especially "Mavericks") apparently do not
+     set the current working directory to the program package directory) */
+  char *main_data_path = getBasePath(command_filename);
+
+#if defined(PLATFORM_MACOSX)
+  if (strSuffix(main_data_path, MAC_APP_BINARY_SUBDIR))
+  {
+    char *main_data_path_old = main_data_path;
+
+    // cut relative path to Mac OS X application binary directory from path
+    main_data_path[strlen(main_data_path) -
+		   strlen(MAC_APP_BINARY_SUBDIR)] = '\0';
+
+    // cut trailing path separator from path (but not if path is root directory)
+    if (strSuffix(main_data_path, "/") && !strEqual(main_data_path, "/"))
+      main_data_path[strlen(main_data_path) - 1] = '\0';
+
+    // replace empty path with current directory
+    if (strEqual(main_data_path, ""))
+      main_data_path = ".";
+
+    // add relative path to Mac OS X application resources directory to path
+    main_data_path = getPath2(main_data_path, MAC_APP_FILES_SUBDIR);
+
+    free(main_data_path_old);
+  }
+#endif
+
+  return main_data_path;
+}
+
+char *getProgramConfigFilename(char *command_filename)
+{
+  char *command_filename_1 = getStringCopy(command_filename);
 
   // strip trailing executable suffix from command filename
   if (strSuffix(command_filename_1, ".exe"))
     command_filename_1[strlen(command_filename_1) - 4] = '\0';
 
-  char *command_basepath = getBasePath(command_filename_ptr);
-  char *command_basename = getBaseNameNoSuffix(command_filename_ptr);
+  char *ro_base_path = getProgramMainDataPath(command_filename, RO_BASE_PATH);
+  char *conf_directory = getPath2(ro_base_path, CONF_DIRECTORY);
+
+  char *command_basepath = getBasePath(command_filename);
+  char *command_basename = getBaseNameNoSuffix(command_filename);
   char *command_filename_2 = getPath2(command_basepath, command_basename);
 
   char *config_filename_1 = getStringCat2(command_filename_1, ".conf");
   char *config_filename_2 = getStringCat2(command_filename_2, ".conf");
+  char *config_filename_3 = getPath2(conf_directory, SETUP_FILENAME);
 
   // 1st try: look for config file that exactly matches the binary filename
   if (fileExists(config_filename_1))
     return config_filename_1;
 
-  // 2nd try: return config filename that matches binary filename without suffix
-  return config_filename_2;
+  // 2nd try: look for config file that matches binary filename without suffix
+  if (fileExists(config_filename_2))
+    return config_filename_2;
+
+  // 3rd try: return setup config filename in global program config directory
+  return config_filename_3;
 }
 
 char *getTapeFilename(int nr)
@@ -495,12 +569,14 @@ char *getScoreFilename(int nr)
   checked_free(filename);
 
   sprintf(basename, "%03d.%s", nr, SCOREFILE_EXTENSION);
-  filename = getPath2(getScoreDir(leveldir_current->subdir), basename);
+
+  /* used instead of "leveldir_current->subdir" (for network games) */
+  filename = getPath2(getScoreDir(levelset.identifier), basename);
 
   return filename;
 }
 
-char *getSetupFilename()
+char *getSetupFilename(void)
 {
   static char *filename = NULL;
 
@@ -511,12 +587,12 @@ char *getSetupFilename()
   return filename;
 }
 
-char *getDefaultSetupFilename()
+char *getDefaultSetupFilename(void)
 {
   return program.config_filename;
 }
 
-char *getEditorSetupFilename()
+char *getEditorSetupFilename(void)
 {
   static char *filename = NULL;
 
@@ -532,7 +608,7 @@ char *getEditorSetupFilename()
   return filename;
 }
 
-char *getHelpAnimFilename()
+char *getHelpAnimFilename(void)
 {
   static char *filename = NULL;
 
@@ -543,7 +619,7 @@ char *getHelpAnimFilename()
   return filename;
 }
 
-char *getHelpTextFilename()
+char *getHelpTextFilename(void)
 {
   static char *filename = NULL;
 
@@ -554,7 +630,7 @@ char *getHelpTextFilename()
   return filename;
 }
 
-char *getLevelSetInfoFilename()
+char *getLevelSetInfoFilename(void)
 {
   static char *filename = NULL;
   char *basenames[] =
@@ -987,7 +1063,7 @@ void InitScoreDirectory(char *level_subdir)
   createDirectory(getScoreDir(level_subdir), "level score", permissions);
 }
 
-static void SaveUserLevelInfo();
+static void SaveUserLevelInfo(void);
 
 void InitUserLevelDirectory(char *level_subdir)
 {
@@ -1001,6 +1077,17 @@ void InitUserLevelDirectory(char *level_subdir)
   }
 }
 
+void InitNetworkLevelDirectory(char *level_subdir)
+{
+  if (!directoryExists(getNetworkLevelDir(level_subdir)))
+  {
+    createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
+    createDirectory(getNetworkDir(), "network data", PERMS_PRIVATE);
+    createDirectory(getNetworkLevelDir(NULL), "main network level", PERMS_PRIVATE);
+    createDirectory(getNetworkLevelDir(level_subdir), "network level", PERMS_PRIVATE);
+  }
+}
+
 void InitLevelSetupDirectory(char *level_subdir)
 {
   createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
@@ -1008,7 +1095,7 @@ void InitLevelSetupDirectory(char *level_subdir)
   createDirectory(getLevelSetupDir(level_subdir), "level setup", PERMS_PRIVATE);
 }
 
-void InitCacheDirectory()
+void InitCacheDirectory(void)
 {
   createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
   createDirectory(getCacheDir(), "cache data", PERMS_PRIVATE);
@@ -1019,7 +1106,7 @@ void InitCacheDirectory()
 /* some functions to handle lists of level and artwork directories           */
 /* ------------------------------------------------------------------------- */
 
-TreeInfo *newTreeInfo()
+TreeInfo *newTreeInfo(void)
 {
   return checked_calloc(sizeof(TreeInfo));
 }
@@ -1346,7 +1433,7 @@ void sortTreeInfo(TreeInfo **node_first)
 #define FILE_PERMS_PUBLIC_ALL	(MODE_R_ALL | MODE_W_ALL)
 
 
-char *getHomeDir()
+char *getHomeDir(void)
 {
   static char *dir = NULL;
 
@@ -1435,7 +1522,7 @@ char *getUserGameDataDir(void)
   return user_game_data_dir;
 }
 
-char *getSetupDir()
+char *getSetupDir(void)
 {
   return getUserGameDataDir();
 }
@@ -1458,7 +1545,7 @@ static int posix_mkdir(const char *pathname, mode_t mode)
 #endif
 }
 
-static boolean posix_process_running_setgid()
+static boolean posix_process_running_setgid(void)
 {
 #if defined(PLATFORM_UNIX)
   return (getgid() != getegid());
@@ -1501,7 +1588,7 @@ void createDirectory(char *dir, char *text, int permission_class)
   posix_umask(last_umask);		/* restore previous umask */
 }
 
-void InitUserDataDirectory()
+void InitUserDataDirectory(void)
 {
   createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
 }
@@ -1528,7 +1615,7 @@ char *getCookie(char *file_type)
 
   sprintf(cookie, "%s_%s_FILE_VERSION_%d.%d",
 	  program.cookie_prefix, file_type,
-	  program.version_major, program.version_minor);
+	  program.version_super, program.version_major);
 
   return cookie;
 }
@@ -1553,7 +1640,7 @@ int getFileVersionFromCookieString(const char *cookie)
   const int len_pattern1 = strlen(pattern1);
   const int len_pattern2 = strlen(pattern2);
   const int len_pattern = len_pattern1 + len_pattern2;
-  int version_major, version_minor;
+  int version_super, version_major;
 
   if (len_cookie <= len_pattern)
     return -1;
@@ -1569,10 +1656,10 @@ int getFileVersionFromCookieString(const char *cookie)
       ptr_cookie2[2] < '0' || ptr_cookie2[2] > '9')
     return -1;
 
-  version_major = ptr_cookie2[0] - '0';
-  version_minor = ptr_cookie2[2] - '0';
+  version_super = ptr_cookie2[0] - '0';
+  version_major = ptr_cookie2[2] - '0';
 
-  return VERSION_IDENT(version_major, version_minor, 0, 0);
+  return VERSION_IDENT(version_super, version_major, 0, 0);
 }
 
 boolean checkCookieString(const char *cookie, const char *template)
@@ -1745,7 +1832,7 @@ static int keys_are_equal(void *key1, void *key2)
   return (strEqual((char *)key1, (char *)key2));
 }
 
-SetupFileHash *newSetupFileHash()
+SetupFileHash *newSetupFileHash(void)
 {
   SetupFileHash *new_hash =
     create_hashtable(16, 0.75, get_hash_from_key, keys_are_equal);
@@ -1977,7 +2064,9 @@ static boolean loadSetupFileData(void *setup_file_data, char *filename,
 
   if (!(file = openFile(filename, MODE_READ)))
   {
+#if DEBUG_NO_CONFIG_FILE
     Error(ERR_DEBUG, "cannot open configuration file '%s'", filename);
+#endif
 
     return FALSE;
   }
@@ -2189,27 +2278,30 @@ SetupFileHash *loadSetupFileHash(char *filename)
 #define LEVELINFO_TOKEN_NAME_SORTING		2
 #define LEVELINFO_TOKEN_AUTHOR			3
 #define LEVELINFO_TOKEN_YEAR			4
-#define LEVELINFO_TOKEN_IMPORTED_FROM		5
-#define LEVELINFO_TOKEN_IMPORTED_BY		6
-#define LEVELINFO_TOKEN_TESTED_BY		7
-#define LEVELINFO_TOKEN_LEVELS			8
-#define LEVELINFO_TOKEN_FIRST_LEVEL		9
-#define LEVELINFO_TOKEN_SORT_PRIORITY		10
-#define LEVELINFO_TOKEN_LATEST_ENGINE		11
-#define LEVELINFO_TOKEN_LEVEL_GROUP		12
-#define LEVELINFO_TOKEN_READONLY		13
-#define LEVELINFO_TOKEN_GRAPHICS_SET_ECS	14
-#define LEVELINFO_TOKEN_GRAPHICS_SET_AGA	15
-#define LEVELINFO_TOKEN_GRAPHICS_SET		16
-#define LEVELINFO_TOKEN_SOUNDS_SET		17
-#define LEVELINFO_TOKEN_MUSIC_SET		18
-#define LEVELINFO_TOKEN_FILENAME		19
-#define LEVELINFO_TOKEN_FILETYPE		20
-#define LEVELINFO_TOKEN_SPECIAL_FLAGS		21
-#define LEVELINFO_TOKEN_HANDICAP		22
-#define LEVELINFO_TOKEN_SKIP_LEVELS		23
-
-#define NUM_LEVELINFO_TOKENS			24
+#define LEVELINFO_TOKEN_PROGRAM_TITLE		5
+#define LEVELINFO_TOKEN_PROGRAM_COPYRIGHT	6
+#define LEVELINFO_TOKEN_PROGRAM_COMPANY		7
+#define LEVELINFO_TOKEN_IMPORTED_FROM		8
+#define LEVELINFO_TOKEN_IMPORTED_BY		9
+#define LEVELINFO_TOKEN_TESTED_BY		10
+#define LEVELINFO_TOKEN_LEVELS			11
+#define LEVELINFO_TOKEN_FIRST_LEVEL		12
+#define LEVELINFO_TOKEN_SORT_PRIORITY		13
+#define LEVELINFO_TOKEN_LATEST_ENGINE		14
+#define LEVELINFO_TOKEN_LEVEL_GROUP		15
+#define LEVELINFO_TOKEN_READONLY		16
+#define LEVELINFO_TOKEN_GRAPHICS_SET_ECS	17
+#define LEVELINFO_TOKEN_GRAPHICS_SET_AGA	18
+#define LEVELINFO_TOKEN_GRAPHICS_SET		19
+#define LEVELINFO_TOKEN_SOUNDS_SET		20
+#define LEVELINFO_TOKEN_MUSIC_SET		21
+#define LEVELINFO_TOKEN_FILENAME		22
+#define LEVELINFO_TOKEN_FILETYPE		23
+#define LEVELINFO_TOKEN_SPECIAL_FLAGS		24
+#define LEVELINFO_TOKEN_HANDICAP		25
+#define LEVELINFO_TOKEN_SKIP_LEVELS		26
+
+#define NUM_LEVELINFO_TOKENS			27
 
 static LevelDirTree ldi;
 
@@ -2221,6 +2313,9 @@ static struct TokenInfo levelinfo_tokens[] =
   { TYPE_STRING,	&ldi.name_sorting,	"name_sorting"		},
   { TYPE_STRING,	&ldi.author,		"author"		},
   { TYPE_STRING,	&ldi.year,		"year"			},
+  { TYPE_STRING,	&ldi.program_title,	"program_title"		},
+  { TYPE_STRING,	&ldi.program_copyright,	"program_copyright"	},
+  { TYPE_STRING,	&ldi.program_company,	"program_company"	},
   { TYPE_STRING,	&ldi.imported_from,	"imported_from"		},
   { TYPE_STRING,	&ldi.imported_by,	"imported_by"		},
   { TYPE_STRING,	&ldi.tested_by,		"tested_by"		},
@@ -2250,6 +2345,9 @@ static struct TokenInfo artworkinfo_tokens[] =
   { TYPE_STRING,	&ldi.name,		"name"			},
   { TYPE_STRING,	&ldi.name_sorting,	"name_sorting"		},
   { TYPE_STRING,	&ldi.author,		"author"		},
+  { TYPE_STRING,	&ldi.program_title,	"program_title"		},
+  { TYPE_STRING,	&ldi.program_copyright,	"program_copyright"	},
+  { TYPE_STRING,	&ldi.program_company,	"program_company"	},
   { TYPE_INTEGER,	&ldi.sort_priority,	"sort_priority"		},
   { TYPE_STRING,	&ldi.basepath,		"basepath"		},
   { TYPE_STRING,	&ldi.fullpath,		"fullpath"		},
@@ -2286,6 +2384,10 @@ static void setTreeInfoToDefaults(TreeInfo *ti, int type)
   ti->author = getStringCopy(ANONYMOUS_NAME);
   ti->year = NULL;
 
+  ti->program_title = NULL;
+  ti->program_copyright = NULL;
+  ti->program_company = NULL;
+
   ti->sort_priority = LEVELCLASS_UNDEFINED;	/* default: least priority */
   ti->latest_engine = FALSE;			/* default: get from level */
   ti->parent_link = FALSE;
@@ -2359,6 +2461,10 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ti, TreeInfo *parent)
   ti->author = getStringCopy(parent->author);
   ti->year = getStringCopy(parent->year);
 
+  ti->program_title = getStringCopy(parent->program_title);
+  ti->program_copyright = getStringCopy(parent->program_copyright);
+  ti->program_company = getStringCopy(parent->program_company);
+
   ti->sort_priority = parent->sort_priority;
   ti->latest_engine = parent->latest_engine;
   ti->parent_link = FALSE;
@@ -2424,6 +2530,11 @@ static TreeInfo *getTreeInfoCopy(TreeInfo *ti)
   ti_copy->name_sorting		= getStringCopy(ti->name_sorting);
   ti_copy->author		= getStringCopy(ti->author);
   ti_copy->year			= getStringCopy(ti->year);
+
+  ti_copy->program_title	= getStringCopy(ti->program_title);
+  ti_copy->program_copyright	= getStringCopy(ti->program_copyright);
+  ti_copy->program_company	= getStringCopy(ti->program_company);
+
   ti_copy->imported_from	= getStringCopy(ti->imported_from);
   ti_copy->imported_by		= getStringCopy(ti->imported_by);
   ti_copy->tested_by		= getStringCopy(ti->tested_by);
@@ -2481,6 +2592,10 @@ void freeTreeInfo(TreeInfo *ti)
   checked_free(ti->author);
   checked_free(ti->year);
 
+  checked_free(ti->program_title);
+  checked_free(ti->program_copyright);
+  checked_free(ti->program_company);
+
   checked_free(ti->class_desc);
 
   checked_free(ti->infotext);
@@ -2556,6 +2671,10 @@ void setSetupInfo(struct TokenInfo *token_info,
       *(char **)setup_value = getStringCopy(token_value);
       break;
 
+    case TYPE_PLAYER:
+      *(int *)setup_value = get_player_nr_from_string(token_value);
+      break;
+
     default:
       break;
   }
@@ -2649,7 +2768,7 @@ static TreeInfo *createTopTreeInfoNode(TreeInfo *node_first)
   setString(&ti_new->name_sorting, ti_new->name);
 
   setString(&ti_new->subdir, STRING_TOP_DIRECTORY);
-  setString(&ti_new->fullpath, node_first->fullpath);
+  setString(&ti_new->fullpath, ".");
 
   ti_new->sort_priority = node_first->sort_priority;;
   ti_new->latest_engine = node_first->latest_engine;
@@ -2672,7 +2791,7 @@ static TreeInfo *createTopTreeInfoNode(TreeInfo *node_first)
 /* functions for handling level and custom artwork info cache                 */
 /* -------------------------------------------------------------------------- */
 
-static void LoadArtworkInfoCache()
+static void LoadArtworkInfoCache(void)
 {
   InitCacheDirectory();
 
@@ -2694,7 +2813,7 @@ static void LoadArtworkInfoCache()
     artworkinfo_cache_new = newSetupFileHash();
 }
 
-static void SaveArtworkInfoCache()
+static void SaveArtworkInfoCache(void)
 {
   char *filename = getPath2(getCacheDir(), ARTWORKINFO_CACHE_FILE);
 
@@ -2773,22 +2892,13 @@ static TreeInfo *getArtworkInfoCacheEntry(LevelDirTree *level_node, int type)
       char *token = getCacheToken(token_prefix, artworkinfo_tokens[i].text);
       char *value = getHashEntry(artworkinfo_cache_old, token);
 
-      setSetupInfo(artworkinfo_tokens, i, value);
-
-      /* check if cache entry for this item is invalid or incomplete */
-      if (value == NULL)
-      {
-	Error(ERR_WARN, "cache entry '%s' invalid", token);
-
-	cached = FALSE;
-      }
+      /* if defined, use value from cache, else keep default value */
+      if (value != NULL)
+	setSetupInfo(artworkinfo_tokens, i, value);
     }
 
     *artwork_info = ldi;
-  }
 
-  if (cached)
-  {
     char *filename_levelinfo = getPath2(getLevelDirFromTreeInfo(level_node),
 					LEVELINFO_FILENAME);
     char *filename_artworkinfo = getPath2(getSetupArtworkDir(artwork_info),
@@ -2898,7 +3008,9 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first,
 
   if (setup_file_hash == NULL)
   {
+#if DEBUG_NO_CONFIG_FILE
     Error(ERR_WARN, "ignoring level directory '%s'", directory_path);
+#endif
 
     free(directory_path);
     free(filename);
@@ -3056,7 +3168,7 @@ static void LoadLevelInfoFromLevelDir(TreeInfo **node_first,
 	  level_directory);
 }
 
-boolean AdjustGraphicsForEMC()
+boolean AdjustGraphicsForEMC(void)
 {
   boolean settings_changed = FALSE;
 
@@ -3066,7 +3178,7 @@ boolean AdjustGraphicsForEMC()
   return settings_changed;
 }
 
-void LoadLevelInfo()
+void LoadLevelInfo(void)
 {
   InitUserLevelDirectory(getLoginName());
 
@@ -3136,8 +3248,10 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first,
 
     if (!valid_file_found)
     {
+#if DEBUG_NO_CONFIG_FILE
       if (!strEqual(directory_name, "."))
 	Error(ERR_WARN, "ignoring artwork directory '%s'", directory_path);
+#endif
 
       free(directory_path);
       free(filename);
@@ -3309,7 +3423,7 @@ static TreeInfo *getDummyArtworkInfo(int type)
   return artwork_new;
 }
 
-void LoadArtworkInfo()
+void LoadArtworkInfo(void)
 {
   LoadArtworkInfoCache();
 
@@ -3445,7 +3559,7 @@ void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node,
   }
 }
 
-void LoadLevelArtworkInfo()
+void LoadLevelArtworkInfo(void)
 {
   print_timestamp_init("LoadLevelArtworkInfo");
 
@@ -3559,9 +3673,53 @@ void AddUserLevelSetToLevelInfo(char *level_subdir_new)
     Error(ERR_EXIT, "internal level set structure corrupted -- aborting");
 }
 
-boolean UpdateUserLevelSet(char *level_subdir,
-			   char *level_name, char *level_author,
-			   int num_levels, int first_level_nr)
+char *getArtworkIdentifierForUserLevelSet(int type)
+{
+  char *classic_artwork_set = getClassicArtworkSet(type);
+
+  /* check for custom artwork configured in "levelinfo.conf" */
+  char *leveldir_artwork_set =
+    *LEVELDIR_ARTWORK_SET_PTR(leveldir_current, type);
+  boolean has_leveldir_artwork_set =
+    (leveldir_artwork_set != NULL && !strEqual(leveldir_artwork_set,
+					       classic_artwork_set));
+
+  /* check for custom artwork in sub-directory "graphics" etc. */
+  TreeInfo *artwork_first_node = ARTWORK_FIRST_NODE(artwork, type);
+  char *leveldir_identifier = leveldir_current->identifier;
+  boolean has_artwork_subdir =
+    (getTreeInfoFromIdentifier(artwork_first_node,
+			       leveldir_identifier) != NULL);
+
+  return (has_leveldir_artwork_set ? leveldir_artwork_set :
+	  has_artwork_subdir       ? leveldir_identifier :
+	  classic_artwork_set);
+}
+
+TreeInfo *getArtworkTreeInfoForUserLevelSet(int type)
+{
+  char *artwork_set = getArtworkIdentifierForUserLevelSet(type);
+  TreeInfo *artwork_first_node = ARTWORK_FIRST_NODE(artwork, type);
+
+  return getTreeInfoFromIdentifier(artwork_first_node, artwork_set);
+}
+
+boolean checkIfCustomArtworkExistsForCurrentLevelSet(void)
+{
+  char *graphics_set =
+    getArtworkIdentifierForUserLevelSet(ARTWORK_TYPE_GRAPHICS);
+  char *sounds_set =
+    getArtworkIdentifierForUserLevelSet(ARTWORK_TYPE_SOUNDS);
+  char *music_set =
+    getArtworkIdentifierForUserLevelSet(ARTWORK_TYPE_MUSIC);
+
+  return (!strEqual(graphics_set, GFX_CLASSIC_SUBDIR) ||
+	  !strEqual(sounds_set,   SND_CLASSIC_SUBDIR) ||
+	  !strEqual(music_set,    MUS_CLASSIC_SUBDIR));
+}
+
+boolean UpdateUserLevelSet(char *level_subdir, char *level_name,
+			   char *level_author, int num_levels)
 {
   char *filename = getPath2(getUserLevelDir(level_subdir), LEVELINFO_FILENAME);
   char *filename_tmp = getStringCat2(filename, ".tmp");
@@ -3582,9 +3740,6 @@ boolean UpdateUserLevelSet(char *level_subdir,
   if (num_levels != -1)
     leveldir->levels = num_levels;
 
-  if (first_level_nr != -1)
-    leveldir->first_level = first_level_nr;
-
   // update values that depend on other values
 
   setString(&leveldir->name_sorting, leveldir->name);
@@ -3605,8 +3760,6 @@ boolean UpdateUserLevelSet(char *level_subdir,
 	fprintf(file_tmp, "%-32s%s\n", "author:", level_author);
       else if (strPrefix(line, "levels:") && num_levels != -1)
 	fprintf(file_tmp, "%-32s%d\n", "levels:", num_levels);
-      else if (strPrefix(line, "first_level:") && first_level_nr != -1)
-	fprintf(file_tmp, "%-32s%d\n", "first_level:", first_level_nr);
       else
 	fputs(line, file_tmp);
     }
@@ -3629,9 +3782,9 @@ boolean UpdateUserLevelSet(char *level_subdir,
   return success;
 }
 
-boolean CreateUserLevelSet(char *level_subdir,
-			   char *level_name, char *level_author,
-			   int num_levels, int first_level_nr)
+boolean CreateUserLevelSet(char *level_subdir, char *level_name,
+			   char *level_author, int num_levels,
+			   boolean use_artwork_set)
 {
   LevelDirTree *level_info;
   char *filename;
@@ -3659,10 +3812,20 @@ boolean CreateUserLevelSet(char *level_subdir,
   setString(&level_info->name, level_name);
   setString(&level_info->author, level_author);
   level_info->levels = num_levels;
-  level_info->first_level = first_level_nr;
+  level_info->first_level = 1;
   level_info->sort_priority = LEVELCLASS_PRIVATE_START;
   level_info->readonly = FALSE;
 
+  if (use_artwork_set)
+  {
+    level_info->graphics_set =
+      getStringCopy(getArtworkIdentifierForUserLevelSet(ARTWORK_TYPE_GRAPHICS));
+    level_info->sounds_set =
+      getStringCopy(getArtworkIdentifierForUserLevelSet(ARTWORK_TYPE_SOUNDS));
+    level_info->music_set =
+      getStringCopy(getArtworkIdentifierForUserLevelSet(ARTWORK_TYPE_MUSIC));
+  }
+
   token_value_position = TOKEN_VALUE_POSITION_SHORT;
 
   fprintFileHeader(file, LEVELINFO_FILENAME);
@@ -3675,12 +3838,16 @@ boolean CreateUserLevelSet(char *level_subdir,
 	i == LEVELINFO_TOKEN_LEVELS ||
 	i == LEVELINFO_TOKEN_FIRST_LEVEL ||
 	i == LEVELINFO_TOKEN_SORT_PRIORITY ||
-	i == LEVELINFO_TOKEN_READONLY)
+	i == LEVELINFO_TOKEN_READONLY ||
+	(use_artwork_set && (i == LEVELINFO_TOKEN_GRAPHICS_SET ||
+			     i == LEVELINFO_TOKEN_SOUNDS_SET ||
+			     i == LEVELINFO_TOKEN_MUSIC_SET)))
       fprintf(file, "%s\n", getSetupLine(levelinfo_tokens, "", i));
 
     /* just to make things nicer :) */
     if (i == LEVELINFO_TOKEN_AUTHOR ||
-	i == LEVELINFO_TOKEN_FIRST_LEVEL)
+	i == LEVELINFO_TOKEN_FIRST_LEVEL ||
+	(use_artwork_set && i == LEVELINFO_TOKEN_READONLY))
       fprintf(file, "\n");	
   }
 
@@ -3696,9 +3863,9 @@ boolean CreateUserLevelSet(char *level_subdir,
   return TRUE;
 }
 
-static void SaveUserLevelInfo()
+static void SaveUserLevelInfo(void)
 {
-  CreateUserLevelSet(getLoginName(), getLoginName(), getRealName(), 100, 1);
+  CreateUserLevelSet(getLoginName(), getLoginName(), getRealName(), 100, FALSE);
 }
 
 char *getSetupValue(int type, void *value)
@@ -3755,6 +3922,10 @@ char *getSetupValue(int type, void *value)
       strcpy(value_string, *(char **)value);
       break;
 
+    case TYPE_PLAYER:
+      sprintf(value_string, "player_%d", *(int *)value + 1);
+      break;
+
     default:
       value_string[0] = '\0';
       break;
@@ -3804,7 +3975,7 @@ char *getSetupLine(struct TokenInfo *token_info, char *prefix, int token_nr)
   return line;
 }
 
-void LoadLevelSetup_LastSeries()
+void LoadLevelSetup_LastSeries(void)
 {
   /* ----------------------------------------------------------------------- */
   /* ~/.<program>/levelsetup.conf                                            */
@@ -3884,17 +4055,17 @@ static void SaveLevelSetup_LastSeries_Ext(boolean deactivate_last_level_series)
   free(filename);
 }
 
-void SaveLevelSetup_LastSeries()
+void SaveLevelSetup_LastSeries(void)
 {
   SaveLevelSetup_LastSeries_Ext(FALSE);
 }
 
-void SaveLevelSetup_LastSeries_Deactivate()
+void SaveLevelSetup_LastSeries_Deactivate(void)
 {
   SaveLevelSetup_LastSeries_Ext(TRUE);
 }
 
-static void checkSeriesInfo()
+static void checkSeriesInfo(void)
 {
   static char *level_directory = NULL;
   Directory *dir;
@@ -3916,7 +4087,7 @@ static void checkSeriesInfo()
   closeDirectory(dir);
 }
 
-void LoadLevelSetup_SeriesInfo()
+void LoadLevelSetup_SeriesInfo(void)
 {
   char *filename;
   SetupFileHash *level_setup_hash = NULL;
@@ -4014,7 +4185,7 @@ void LoadLevelSetup_SeriesInfo()
   free(filename);
 }
 
-void SaveLevelSetup_SeriesInfo()
+void SaveLevelSetup_SeriesInfo(void)
 {
   char *filename;
   char *level_subdir = leveldir_current->subdir;