From: Holger Schemel <info@artsoft.org>
Date: Sat, 25 Aug 2007 11:57:21 +0000 (+0200)
Subject: rnd-20070825-3-src
X-Git-Tag: 3.2.4^2~16
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=267fdfe7bd36de708911eb361f911143f23a12c3

rnd-20070825-3-src
* fixed problem with artwork config entries using the value "[DEFAULT]";
  this does not what one might expect, but sets the value to an invalid
  value -- solution: simply ignore such entries, which results in this
  value keeping its previous (real) default value (in general, entries
  that should use their default value should just not be defined here)
---

diff --git a/ChangeLog b/ChangeLog
index 737d3f62..ceaf3a45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,11 @@
 	  is used with a different artwork set (e.g. using "override graphics")
 	* fixed problem with door borders on main screen by first drawing doors
 	  and then the corresponding border masks, but not vice versa
+	* fixed problem with artwork config entries using the value "[DEFAULT]";
+	  this does not what one might expect, but sets the value to an invalid
+	  value -- solution: simply ignore such entries, which results in this
+	  value keeping its previous (real) default value (in general, entries
+	  that should use their default value should just not be defined here)
 
 2007-08-22
 	* fixed problem with broken crumbled graphics after level set changes
diff --git a/src/conftime.h b/src/conftime.h
index 6cab2c64..acc80aab 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2007-08-25 10:35"
+#define COMPILE_DATE_STRING "2007-08-25 13:56"
diff --git a/src/files.c b/src/files.c
index df605364..cd2f30c6 100644
--- a/src/files.c
+++ b/src/files.c
@@ -8956,7 +8956,8 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
   {
     char *value = getHashEntry(setup_file_hash, image_config_vars[i].token);
 
-    if (value != NULL)
+    /* (ignore definitions set to "[DEFAULT]" which are already initialized) */
+    if (value != NULL && !strEqual(value, ARG_DEFAULT))
       *image_config_vars[i].value =
 	get_token_parameter_value(image_config_vars[i].token, value);
   }
diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index cb373a67..df6e2f8a 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -664,6 +664,11 @@ char *getCustomImageFilename(char *basename)
 #if CREATE_SPECIAL_EDITION
   free(filename);
 
+  /* !!! INSERT WARNING HERE TO REPORT MISSING ARTWORK FILES !!! */
+#if 0
+  printf("::: MISSING ARTWORK FILE '%s'\n", basename);
+#endif
+
   /* 6th try: look for fallback artwork in old default artwork directory */
   /* (needed to prevent errors when trying to access unused artwork files) */
   filename = getPath2(options.graphics_directory, GFX_FALLBACK_FILENAME);
diff --git a/src/screens.c b/src/screens.c
index f1117601..1a612a90 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -778,8 +778,10 @@ static void InitializeTitleControls(boolean show_title_initial)
 {
   num_title_screens = 0;
 
+#if 0
   if (show_title_initial)
     InitializeTitleControls_CheckTitleInfo(TRUE);
+#endif
 
   InitializeTitleControls_CheckTitleInfo(FALSE);
 
diff --git a/src/tools.c b/src/tools.c
index e469a501..09a179dd 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -535,7 +535,7 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
   printf("::: NOW FADING %d ... [%d]\n", fade_mode, fade_type);
 #endif
 
-#if 1
+#if 0
   if (fade_mask == REDRAW_NONE)
     fade_mask = REDRAW_FIELD;
 #endif