From: Holger Schemel <info@artsoft.org>
Date: Wed, 26 Sep 2007 21:11:33 +0000 (+0200)
Subject: rnd-20070926-2-src
X-Git-Tag: 3.2.5^2~4
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=32c4954de6a800eef636c8167fb3469f6f3182c8;p=rocksndiamonds.git

rnd-20070926-2-src
* added new custom artwork setup option "auto-override non-CE sets" for
  automatic artwork override that is only used for level sets without
  custom element artwork (as it does not make much sense to override
  any artwork that redefines custom element artwork for sets using CEs)
* fixed default artwork for "special" R'n'D versions always using the
  "classic" artwork as the base if base artwork is not explicitly
  defined in "levelinfo.conf", regardless of different default artwork
  used by the special R'n'D version -- this is needed because any such
  custom artwork is designed using the "classic" artwork definitions as
  the base (including menu definitions and screen positions etc., which
  would otherwise be taken from the different special default artwork)
---

diff --git a/ChangeLog b/ChangeLog
index 88c53f42..39600a6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-09-26
+	* added new custom artwork setup option "auto-override non-CE sets" for
+	  automatic artwork override that is only used for level sets without
+	  custom element artwork (as it does not make much sense to override
+	  any artwork that redefines custom element artwork for sets using CEs)
+	* fixed default artwork for "special" R'n'D versions always using the
+	  "classic" artwork as the base if base artwork is not explicitly
+	  defined in "levelinfo.conf", regardless of different default artwork
+	  used by the special R'n'D version -- this is needed because any such
+	  custom artwork is designed using the "classic" artwork definitions as
+	  the base (including menu definitions and screen positions etc., which
+	  would otherwise be taken from the different special default artwork)
+
 2007-09-17
 	* fixed drawing of animated "quicksand.filling" and "quicksand.emptying"
 	  for both EMC and R'n'D graphics engine (heavy workarounds needed due
diff --git a/src/conftime.h b/src/conftime.h
index a25ffbaa..351055bc 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2007-09-26 00:53"
+#define COMPILE_DATE_STRING "2007-09-26 23:01"
diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 9061a3cf..1cbb1c94 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -2211,7 +2211,7 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info,
   if (filename == NULL)
     return;
 
-#if 1
+#if 0
   printf("LoadArtworkConfigFromFilename '%s' ...\n", filename);
 #endif
 
@@ -2671,9 +2671,11 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
     /* first look for special artwork configured in level series config */
     filename_base = getCustomArtworkLevelConfigFilename(artwork_info->type);
 
+#if 0
     printf("::: filename_base == '%s' [%s, %s]\n", filename_base,
 	   leveldir_current->graphics_set,
 	   leveldir_current->graphics_path);
+#endif
 
     if (fileExists(filename_base))
       LoadArtworkConfigFromFilename(artwork_info, filename_base);
diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index e8e99a38..45509d79 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -262,6 +262,26 @@ static char *getDefaultMusicDir(char *music_subdir)
   return music_dir;
 }
 
+#if 1
+static char *getDefaultArtworkSet(int type)
+{
+  return (type == TREE_TYPE_GRAPHICS_DIR ? "gfx_classic" :
+	  type == TREE_TYPE_SOUNDS_DIR   ? "snd_classic" :
+	  type == TREE_TYPE_MUSIC_DIR    ? "mus_classic" : "");
+}
+
+static char *getDefaultArtworkDir(int type)
+{
+  return (type == TREE_TYPE_GRAPHICS_DIR ?
+	  getDefaultGraphicsDir("gfx_classic") :
+	  type == TREE_TYPE_SOUNDS_DIR ?
+	  getDefaultSoundsDir("snd_classic") :
+	  type == TREE_TYPE_MUSIC_DIR ?
+	  getDefaultMusicDir("mus_classic") : "");
+}
+
+#else
+
 static char *getDefaultArtworkSet(int type)
 {
   return (type == TREE_TYPE_GRAPHICS_DIR ? GFX_CLASSIC_SUBDIR :
@@ -278,6 +298,7 @@ static char *getDefaultArtworkDir(int type)
 	  type == TREE_TYPE_MUSIC_DIR ?
 	  getDefaultMusicDir(MUS_CLASSIC_SUBDIR) : "");
 }
+#endif
 
 static char *getUserGraphicsDir()
 {