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 737d3f62e6b940eb03d8315c0b08b7e0026df85b..ceaf3a4599bd825b87d80a778b781c3e35f011da 100644 (file)
--- 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 6cab2c64f04ecb7868c564ede1ace2b8b6726471..acc80aabf0a5698795fc95cdcea98681a1f440a6 100644 (file)
--- 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 df60536450e43b3954df90ba81ed3b831e0e1354..cd2f30c6fabdaebb386e02aecc7c4a7adb3844d2 100644 (file)
--- 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 cb373a670777189f6e83394fc12c52b5c1d10305..df6e2f8a0bc8ebad3299240c2bf449f3786e8307 100644 (file)
--- 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 f1117601646251ba9f524629436ea01970203c3c..1a612a90498c686042110ecf98e690a538302fe8 100644 (file)
--- 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 e469a50181a8d909f787300a2e5ec2adab998dac..09a179dd2aecd4ee6f989035e6c58560efa92ac7 100644 (file)
--- 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