X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fsetup.c;h=f28df34f30713cc103e0ce83b88a854fb85fd243;hb=4d6ea47cc83d553df014ff38a69f45a9f5ac41fa;hp=d6ec2eeb175c322233dfb856b9c0b8bde9cb727a;hpb=3742724070e341b044fdfedfd0bb5780d64fb554;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index d6ec2eeb..f28df34f 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -114,22 +114,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;
@@ -197,6 +181,22 @@ static char *getLevelDirFromTreeInfo(TreeInfo *node)
   return level_dir;
 }
 
+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 *getCurrentLevelDir()
 {
   return getLevelDirFromTreeInfo(leveldir_current);
@@ -464,27 +464,35 @@ char *getProgramMainDataPath(char *command_filename, char *base_path)
   return main_data_path;
 }
 
-char *getProgramConfigFilename(char *command_filename_ptr)
+char *getProgramConfigFilename(char *command_filename)
 {
-  char *command_filename_1 = getStringCopy(command_filename_ptr);
+  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)
@@ -3598,6 +3606,43 @@ void AddUserLevelSetToLevelInfo(char *level_subdir_new)
     Error(ERR_EXIT, "internal level set structure corrupted -- aborting");
 }
 
+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);
+}
+
+boolean checkIfCustomArtworkExistsForCurrentLevelSet()
+{
+  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)
 {
@@ -3663,7 +3708,8 @@ boolean UpdateUserLevelSet(char *level_subdir, char *level_name,
 }
 
 boolean CreateUserLevelSet(char *level_subdir, char *level_name,
-			   char *level_author, int num_levels)
+			   char *level_author, int num_levels,
+			   boolean use_artwork_set)
 {
   LevelDirTree *level_info;
   char *filename;
@@ -3695,6 +3741,16 @@ boolean CreateUserLevelSet(char *level_subdir, char *level_name,
   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);
@@ -3707,12 +3763,16 @@ boolean CreateUserLevelSet(char *level_subdir, char *level_name,
 	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");	
   }
 
@@ -3730,7 +3790,7 @@ boolean CreateUserLevelSet(char *level_subdir, char *level_name,
 
 static void SaveUserLevelInfo()
 {
-  CreateUserLevelSet(getLoginName(), getLoginName(), getRealName(), 100);
+  CreateUserLevelSet(getLoginName(), getLoginName(), getRealName(), 100, FALSE);
 }
 
 char *getSetupValue(int type, void *value)