rnd-20030114-1-src

diff --git a/CHANGES b/CHANGES
index 0134d5fedc792c850432c85644d328f5e2f5b662..01355225fd8a58dc795da132c39dd77355fe6938 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+Pre-Release Version 2.2.0rc3 [?? ??? ????]
+------------------------------------------
+
 Pre-Release Version 2.2.0rc2 [13 JAN 2003]
 ------------------------------------------
        - added support for stereo WAV sound files

diff --git a/src/conftime.h b/src/conftime.h
index 95387954ea6033536a7909e3f4ce7b0f3abe875f..0c754ac98232e2b3a199a9550e923b2562e649ee 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2003-01-13 02:38]"
+#define COMPILE_DATE_STRING "[2003-01-14 01:48]"

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 9865b9d6c6e29c7e0a724c687db73a3a8210401c..a555a20000531f6ae617cc39ad6e4ab5dd188f38 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -1533,6 +1533,71 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
   return file_list;
 }
 
+static void CheckArtworkConfig(struct ArtworkListInfo *artwork_info)
+{
+  struct FileInfo *file_list = artwork_info->file_list;
+  struct ConfigInfo *suffix_list = artwork_info->suffix_list;
+  int num_file_list_entries = artwork_info->num_file_list_entries;
+  int num_suffix_list_entries = artwork_info->num_suffix_list_entries;
+  char *filename = getCustomArtworkConfigFilename(artwork_info->type);
+  struct SetupFileList *setup_file_list;
+  char *known_token_value = "[KNOWN_TOKEN]";
+  int i, j;
+
+  if (!options.verbose)
+    return;
+
+  if (filename == NULL)
+    return;
+
+  if ((setup_file_list = loadSetupFileList(filename)) == NULL)
+    return;
+
+  for (i=0; i<num_file_list_entries; i++)
+  {
+    /* check for config token that is the base token without any suffixes */
+    if (getTokenValue(setup_file_list, file_list[i].token) != NULL)
+    {
+      /* mark token as well known from default config */
+      setTokenValue(setup_file_list, file_list[i].token, known_token_value);
+    }
+
+    /* check for config tokens that can be build by base token and suffixes */
+    for (j=0; j<num_suffix_list_entries; j++)
+    {
+      char *token = getStringCat2(file_list[i].token, suffix_list[j].token);
+
+      if (getTokenValue(setup_file_list, token) != NULL)
+      {
+       /* mark token as well known from default config */
+       setTokenValue(setup_file_list, token, known_token_value);
+      }
+
+      free(token);
+    }
+  }
+
+  /* set some additional tokens to "known" */
+  setTokenValue(setup_file_list, "name", known_token_value);
+  setTokenValue(setup_file_list, "sort_priority", known_token_value);
+
+  /* check for each token in config file if it is defined in default config */
+  while (setup_file_list != NULL)
+  {
+    if (strcmp(setup_file_list->value, known_token_value) != 0)
+    {
+      Error(ERR_RETURN, "custom artwork configuration warning:");
+      Error(ERR_RETURN, "- config file: '%s'", filename);
+      Error(ERR_RETURN, "- config token: '%s'", setup_file_list->token);
+      Error(ERR_WARN, "token not recognized");
+    }
+
+    setup_file_list = setup_file_list->next;
+  }
+
+  freeSetupFileList(setup_file_list);
+}
+
 static void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
 {
   struct FileInfo *file_list = artwork_info->file_list;
@@ -1561,47 +1626,47 @@ static void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
   if (filename == NULL)
     return;
 
-  if ((setup_file_list = loadSetupFileList(filename)))
+  if ((setup_file_list = loadSetupFileList(filename)) == NULL)
+    return;
+
+  for (i=0; i<num_file_list_entries; i++)
   {
-    for (i=0; i<num_file_list_entries; i++)
-    {
-      char *filename = getTokenValue(setup_file_list, file_list[i].token);
+    char *filename = getTokenValue(setup_file_list, file_list[i].token);
 
-      if (filename)
-       for (j=0; j<num_suffix_list_entries; j++)
-         file_list[i].parameter[j] =
-           get_parameter_value(suffix_list[j].type, suffix_list[j].value);
-      else
-       filename = file_list[i].default_filename;
+    if (filename)
+      for (j=0; j<num_suffix_list_entries; j++)
+       file_list[i].parameter[j] =
+         get_parameter_value(suffix_list[j].type, suffix_list[j].value);
+    else
+      filename = file_list[i].default_filename;
 
-      file_list[i].filename = getStringCopy(filename);
+    file_list[i].filename = getStringCopy(filename);
 
-      for (j=0; j<num_suffix_list_entries; j++)
-      {
-       char *token = getStringCat2(file_list[i].token, suffix_list[j].token);
-       char *value = getTokenValue(setup_file_list, token);
+    for (j=0; j<num_suffix_list_entries; j++)
+    {
+      char *token = getStringCat2(file_list[i].token, suffix_list[j].token);
+      char *value = getTokenValue(setup_file_list, token);
 
-       if (value != NULL)
-         file_list[i].parameter[j] =
-           get_parameter_value(suffix_list[j].type, value);
+      if (value != NULL)
+       file_list[i].parameter[j] =
+         get_parameter_value(suffix_list[j].type, value);
 
-       free(token);
-      }
+      free(token);
     }
+  }
 
-    freeSetupFileList(setup_file_list);
+  freeSetupFileList(setup_file_list);
 
 #if 0
-    for (i=0; i<num_file_list_entries; i++)
-    {
-      printf("'%s' ", file_list[i].token);
-      if (file_list[i].filename)
-       printf("-> '%s'\n", file_list[i].filename);
-      else
-       printf("-> UNDEFINED [-> '%s']\n", file_list[i].default_filename);
-    }
-#endif
+  for (i=0; i<num_file_list_entries; i++)
+  {
+    printf("'%s' ", file_list[i].token);
+    if (file_list[i].filename)
+      printf("-> '%s'\n", file_list[i].filename);
+    else
+      printf("-> UNDEFINED [-> '%s']\n", file_list[i].default_filename);
   }
+#endif
 }
 
 static void deleteArtworkListEntry(struct ArtworkListInfo *artwork_info,
@@ -1784,6 +1849,7 @@ void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info)
   struct FileInfo *file_list = artwork_info->file_list;
   int i;
 
+  CheckArtworkConfig(artwork_info);
   LoadArtworkConfig(artwork_info);
 
 #if 0

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 5cd8c700fc1925bf4d5b5a4051c908a35db4e79a..7754e5e4ff42861a6d25f9c681610caca47bb7c8 100644 (file)
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -1069,8 +1069,8 @@ char *getTokenValue(struct SetupFileList *setup_file_list, char *token)
     return getTokenValue(setup_file_list->next, token);
 }
 
-static void setTokenValue(struct SetupFileList *setup_file_list,
-                         char *token, char *value)
+void setTokenValue(struct SetupFileList *setup_file_list,
+                  char *token, char *value)
 {
   if (!setup_file_list)
     return;

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 657467f40f5c8909854e2a748bee2466684cb2cf..cc26e2bf610ab6be4bd239dbdc88b7ed6b976de8 100644 (file)
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -215,6 +215,7 @@ boolean checkCookieString(const char *, const char *);
 char *getFormattedSetupEntry(char *, char *);
 void freeSetupFileList(struct SetupFileList *);
 char *getTokenValue(struct SetupFileList *, char *);
+void setTokenValue(struct SetupFileList *, char *, char *);
 struct SetupFileList *loadSetupFileList(char *);
 void checkSetupFileListIdentifier(struct SetupFileList *, char *);
 void setSetupInfo(struct TokenInfo *, int, char *);