rnd-20070319-1-src

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index a0389f4353bec975aedd718cb059a7f718bca2e5..501339f135e66edb086800e341df9aef93c67347 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -8321,33 +8321,6 @@ void LoadCustomElementDescriptions()
   freeSetupFileHash(setup_file_hash);
 }
 
-static int get_token_parameter_value(char *token, char *value_raw)
-{
-  char *suffix;
-
-  if (token == NULL || value_raw == NULL)
-    return ARG_UNDEFINED_VALUE;
-
-  suffix = strrchr(token, '.');
-  if (suffix == NULL)
-    suffix = token;
-
-  if (strncmp(suffix, ".font", 5) == 0)
-  {
-    int i;
-
-    /* !!! OPTIMIZE THIS BY USING HASH !!! */
-    for (i = 0; i < NUM_FONTS; i++)
-      if (strEqual(value_raw, font_info[i].token_name))
-       return i;
-
-    /* if font not found, use reliable default value */
-    return FONT_INITIAL_1;
-  }
-
-  return get_parameter_value(value_raw, suffix, TYPE_INTEGER);
-}
-
 static void LoadSpecialMenuDesignSettingsFromFilename(char *filename)
 {
   static struct TitleMessageInfo tmi;
@@ -8364,7 +8337,7 @@ static void LoadSpecialMenuDesignSettingsFromFilename(char *filename)
     { TYPE_INTEGER,    &tmi.font,              ".font"                 },
     { TYPE_BOOLEAN,    &tmi.autowrap,          ".autowrap"             },
     { TYPE_BOOLEAN,    &tmi.centered,          ".centered"             },
-    { TYPE_BOOLEAN,    &tmi.skip_comments,     ".skip_comments"        },
+    { TYPE_BOOLEAN,    &tmi.parse_comments,    ".parse_comments"       },
     { TYPE_INTEGER,    &tmi.sort_priority,     ".sort_priority"        },
 
     { -1,              NULL,                   NULL                    }
@@ -8468,7 +8441,7 @@ void LoadSpecialMenuDesignSettings()
   char *filename_base = UNDEFINED_FILENAME, *filename_local;
   int i, j;
 
-  /* always start with reliable default values from default config */
+  /* always start with reliable default values from static default config */
   for (i = 0; image_config_vars[i].token != NULL; i++)
     for (j = 0; image_config[j].token != NULL; j++)
       if (strEqual(image_config_vars[i].token, image_config[j].token))
@@ -8476,6 +8449,13 @@ void LoadSpecialMenuDesignSettings()
          get_token_parameter_value(image_config_vars[i].token,
                                    image_config[j].value);
 
+  /* special case: initialize with default values that may be overwritten */
+  for (i = 0; i < MAX_NUM_TITLE_MESSAGES; i++)
+  {
+    titlemessage_initial[i] = titlemessage_initial_default;
+    titlemessage[i] = titlemessage_default;
+  }
+
   if (!SETUP_OVERRIDE_ARTWORK(setup, ARTWORK_TYPE_GRAPHICS))
   {
     /* first look for special settings configured in level series config */