X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=1473bc30e95d11935ad0d720bae82af0fd315996;hb=92204d79d159df0be4bd05c4b4e4dabbcaefe805;hp=5356258904290413bcc1648f3897247b031da5eb;hpb=ba0568bc8d5b8b3d081691b8e987f2b66a4c13e6;p=rocksndiamonds.git

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 53562589..1473bc30 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -442,7 +442,7 @@ char *getPath3(char *path1, char *path2, char *path3)
   return complete_path;
 }
 
-static char *getStringCat2(char *s1, char *s2)
+char *getStringCat2(char *s1, char *s2)
 {
   char *complete_string = checked_malloc(strlen(s1) + strlen(s2) + 1);
 
@@ -1499,6 +1499,9 @@ boolean FileIsArtworkType(char *basename, int type)
 /* functions for loading artwork configuration information                   */
 /* ------------------------------------------------------------------------- */
 
+static void FreeCustomArtworkList(struct ArtworkListInfo *,
+				  struct ListNodeInfo ***, int *);
+
 static int get_parameter_value(int type, char *value)
 {
   return (strcmp(value, ARG_UNDEFINED) == 0 ? ARG_UNDEFINED_VALUE :
@@ -1607,28 +1610,32 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
   return file_list;
 }
 
-#define SUFFIX_NO_MATCH		0
-#define SUFFIX_MATCH		(1 << 0)
-#define SUFFIX_MATCH_COMPLETE	(1 << 1)
-
-static int token_suffix_match(char *token, char *suffix, int start_pos)
+static boolean token_suffix_match(char *token, char *suffix, int start_pos)
 {
   int len_token = strlen(token);
   int len_suffix = strlen(suffix);
 
-  if (start_pos + len_suffix > len_token)
-    return SUFFIX_NO_MATCH;
+#if 0
+  if (IS_PARENT_PROCESS(audio.mixer_pid))
+    printf(":::::::::: check '%s' for '%s' ::::::::::\n", token, suffix);
+#endif
+
+  if (start_pos < 0)	/* compare suffix from end of string */
+    start_pos += len_token;
+
+  if (start_pos < 0 || start_pos + len_suffix > len_token)
+    return FALSE;
 
   if (strncmp(&token[start_pos], suffix, len_suffix) != 0)
-    return SUFFIX_NO_MATCH;
+    return FALSE;
 
   if (token[start_pos + len_suffix] == '\0')
-    return SUFFIX_MATCH_COMPLETE;
+    return TRUE;
 
   if (token[start_pos + len_suffix] == '.')
-    return SUFFIX_MATCH;
+    return TRUE;
 
-  return SUFFIX_NO_MATCH;
+  return FALSE;
 }
 
 #define KNOWN_TOKEN_VALUE	"[KNOWN_TOKEN]"
@@ -1677,6 +1684,50 @@ static void read_token_parameters(struct SetupFileList *setup_file_list,
   }
 }
 
+static void add_dynamic_file_list_entry(struct FileInfo **list,
+					int *num_list_entries,
+					struct SetupFileList *extra_file_list,
+					struct ConfigInfo *suffix_list,
+					int num_suffix_list_entries,
+					char *token)
+{
+  struct FileInfo *new_list_entry;
+  int parameter_array_size = num_suffix_list_entries * sizeof(int);
+
+#if 0
+  if (IS_PARENT_PROCESS(audio.mixer_pid))
+    printf("===> found dynamic definition '%s'\n", token);
+#endif
+
+  (*num_list_entries)++;
+  *list = checked_realloc(*list, *num_list_entries * sizeof(struct FileInfo));
+  new_list_entry = &(*list)[*num_list_entries - 1];
+
+  new_list_entry->token = getStringCopy(token);
+  new_list_entry->parameter = checked_calloc(parameter_array_size);
+
+  read_token_parameters(extra_file_list, suffix_list, new_list_entry);
+}
+
+static void add_property_mapping(struct PropertyMapping **list,
+				 int *num_list_entries,
+				 int base_index, int ext1_index,int ext2_index,
+				 int artwork_index)
+{
+  struct PropertyMapping *new_list_entry;
+
+  (*num_list_entries)++;
+  *list = checked_realloc(*list,
+			  *num_list_entries * sizeof(struct PropertyMapping));
+  new_list_entry = &(*list)[*num_list_entries - 1];
+
+  new_list_entry->base_index = base_index;
+  new_list_entry->ext1_index = ext1_index;
+  new_list_entry->ext2_index = ext2_index;
+
+  new_list_entry->artwork_index = artwork_index;
+}
+
 void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
 {
   struct FileInfo *file_list = artwork_info->file_list;
@@ -1711,6 +1762,34 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
       file_list[i].parameter[j] = file_list[i].default_parameter[j];
   }
 
+  /* free previous dynamic artwork file array */
+  if (artwork_info->dynamic_file_list != NULL)
+  {
+    for (i=0; i<artwork_info->num_dynamic_file_list_entries; i++)
+    {
+      free(artwork_info->dynamic_file_list[i].token);
+      free(artwork_info->dynamic_file_list[i].filename);
+      free(artwork_info->dynamic_file_list[i].parameter);
+    }
+
+    free(artwork_info->dynamic_file_list);
+
+    artwork_info->dynamic_file_list = NULL;
+    artwork_info->num_dynamic_file_list_entries = 0;
+
+    FreeCustomArtworkList(artwork_info, &artwork_info->dynamic_artwork_list,
+			  &artwork_info->num_dynamic_file_list_entries);
+  }
+
+  /* free previous property mapping */
+  if (artwork_info->property_mapping != NULL)
+  {
+    free(artwork_info->property_mapping);
+
+    artwork_info->property_mapping = NULL;
+    artwork_info->num_property_mapping_entries = 0;
+  }
+
   if (filename == NULL)
     return;
 
@@ -1721,11 +1800,11 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
   for (i=0; i<num_file_list_entries; i++)
     read_token_parameters(setup_file_list, suffix_list, &file_list[i]);
 
-  /* set some additional tokens to "known" */
+  /* set all known tokens to "known" keyword */
   setTokenValue(setup_file_list, "name", known_token_value);
   setTokenValue(setup_file_list, "sort_priority", known_token_value);
 
-  /* copy all unknown config file tokens to special config list */
+  /* copy all unknown config file tokens to extra config list */
   for (list = setup_file_list; list != NULL; list = list->next)
   {
     if (strcmp(list->value, known_token_value) != 0)
@@ -1740,72 +1819,198 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
   /* at this point, we do not need the config file list anymore -- free it */
   freeSetupFileList(setup_file_list);
 
-  if (extra_file_list != NULL)
+  /* now try to determine valid, dynamically defined config tokens */
+
+  for (list = extra_file_list; list != NULL; list = list->next)
   {
-    if (options.verbose && IS_PARENT_PROCESS(audio.mixer_pid))
+    struct FileInfo **dynamic_file_list =
+      &artwork_info->dynamic_file_list;
+    int *num_dynamic_file_list_entries =
+      &artwork_info->num_dynamic_file_list_entries;
+    struct PropertyMapping **property_mapping =
+      &artwork_info->property_mapping;
+    int *num_property_mapping_entries =
+      &artwork_info->num_property_mapping_entries;
+    int current_summarized_file_list_entry =
+      artwork_info->num_file_list_entries +
+      artwork_info->num_dynamic_file_list_entries;
+    char *token = list->token;
+    int len_token = strlen(token);
+    int start_pos;
+    boolean base_prefix_found = FALSE;
+    boolean parameter_suffix_found = FALSE;
+
+    /* skip all parameter definitions (handled by read_token_parameters()) */
+    for (i=0; i < num_suffix_list_entries && !parameter_suffix_found; i++)
     {
-      Error(ERR_RETURN_LINE, "-");
-      Error(ERR_RETURN, "warning: unknown token(s) found in config file:");
-      Error(ERR_RETURN, "- config file: '%s'", filename);
+      int len_suffix = strlen(suffix_list[i].token);
 
-      for (list = extra_file_list; list != NULL; list = list->next)
-	Error(ERR_RETURN, "- unknown token: '%s'", list->token);
+      if (token_suffix_match(token, suffix_list[i].token, -len_suffix))
+	parameter_suffix_found = TRUE;
+    }
 
-      Error(ERR_RETURN_LINE, "-");
+#if 0
+    if (IS_PARENT_PROCESS(audio.mixer_pid))
+    {
+      if (parameter_suffix_found)
+	printf("---> skipping token '%s' (parameter token)\n", token);
+      else
+	printf("---> examining token '%s': search prefix ...\n", token);
     }
+#endif
 
-    /* now try to determine valid, dynamically defined config tokens */
+    if (parameter_suffix_found)
+      continue;
 
-    for (list = extra_file_list; list != NULL; list = list->next)
+    /* ---------- step 1: search for matching base prefix ---------- */
+
+    start_pos = 0;
+    for (i=0; i<num_base_prefixes && !base_prefix_found; i++)
     {
-      char *token = list->token;
+      char *base_prefix = base_prefixes[i];
+      int len_base_prefix = strlen(base_prefix);
+      boolean ext1_suffix_found = FALSE;
+
+      base_prefix_found = token_suffix_match(token, base_prefix, start_pos);
+
+      if (!base_prefix_found)
+	continue;
+
+      if (start_pos + len_base_prefix == len_token)	/* exact match */
+      {
+	add_dynamic_file_list_entry(dynamic_file_list,
+				    num_dynamic_file_list_entries,
+				    extra_file_list,
+				    suffix_list,
+				    num_suffix_list_entries,
+				    token);
+	add_property_mapping(property_mapping,
+			     num_property_mapping_entries,
+			     i, -1, -1,
+			     current_summarized_file_list_entry);
+	continue;
+      }
+
+#if 0
+      if (IS_PARENT_PROCESS(audio.mixer_pid))
+	printf("---> examining token '%s': search 1st suffix ...\n", token);
+#endif
+
+      /* ---------- step 2: search for matching first suffix ---------- */
 
-      for (i=0; i<num_base_prefixes; i++)
+      start_pos += len_base_prefix;
+      for (j=0; j<num_ext1_suffixes && !ext1_suffix_found; j++)
       {
-	char *base_prefix = base_prefixes[i];
-	int start_pos = 0;
-	int match = token_suffix_match(token, base_prefix, start_pos);
+	char *ext1_suffix = ext1_suffixes[j];
+	int len_ext1_suffix = strlen(ext1_suffix);
+	boolean ext2_suffix_found = FALSE;
+
+	ext1_suffix_found = token_suffix_match(token, ext1_suffix, start_pos);
+
+	if (!ext1_suffix_found)
+	  continue;
 
-	if (match == SUFFIX_MATCH_COMPLETE)
+	if (start_pos + len_ext1_suffix == len_token)	/* exact match */
 	{
-	  printf("--- found complete token '%s'\n", token);
+	  add_dynamic_file_list_entry(dynamic_file_list,
+				      num_dynamic_file_list_entries,
+				      extra_file_list,
+				      suffix_list,
+				      num_suffix_list_entries,
+				      token);
+	  add_property_mapping(property_mapping,
+			       num_property_mapping_entries,
+			       i, j, -1,
+			       current_summarized_file_list_entry);
+	  continue;
 	}
-	else if (match == SUFFIX_MATCH)
+
+#if 0
+	if (IS_PARENT_PROCESS(audio.mixer_pid))
+	  printf("---> examining token '%s': search 2nd suffix ...\n", token);
+#endif
+
+	/* ---------- step 3: search for matching second suffix ---------- */
+
+	start_pos += len_ext1_suffix;
+	for (k=0; k<num_ext2_suffixes && !ext2_suffix_found; k++)
 	{
-	  int len_base_prefix = strlen(base_prefix);
+	  char *ext2_suffix = ext2_suffixes[k];
+	  int len_ext2_suffix = strlen(ext2_suffix);
 
-	  for (j=0; j<num_ext1_suffixes; j++)
+	  ext2_suffix_found = token_suffix_match(token, ext2_suffix,start_pos);
+
+	  if (!ext2_suffix_found)
+	    continue;
+
+	  if (start_pos + len_ext2_suffix == len_token)	/* exact match */
 	  {
-	    char *ext1_suffix = ext1_suffixes[j];
-	    int start_pos = len_base_prefix;
-	    int match = token_suffix_match(token, ext1_suffix, start_pos);
-
-	    if (match == SUFFIX_MATCH_COMPLETE)
-	    {
-	      printf("--- found complete token '%s'\n", token);
-	    }
-	    else if (match == SUFFIX_MATCH)
-	    {
-	      int len_ext1_suffix = strlen(ext1_suffix);
-
-	      for (k=0; k<num_ext2_suffixes; k++)
-	      {
-		char *ext2_suffix = ext2_suffixes[k];
-		int start_pos = len_base_prefix + len_ext1_suffix;
-		int match = token_suffix_match(token, ext2_suffix, start_pos);
-
-		if (match == SUFFIX_MATCH_COMPLETE)
-		{
-		  printf("--- found complete token '%s'\n", token);
-		}
-	      }
-	    }
+	    add_dynamic_file_list_entry(dynamic_file_list,
+					num_dynamic_file_list_entries,
+					extra_file_list,
+					suffix_list,
+					num_suffix_list_entries,
+					token);
+	    add_property_mapping(property_mapping,
+				 num_property_mapping_entries,
+				 i, j, k,
+				 current_summarized_file_list_entry);
+	    continue;
 	  }
 	}
       }
     }
   }
 
+  if (artwork_info->num_dynamic_file_list_entries > 0)
+  {
+    artwork_info->dynamic_artwork_list =
+      checked_calloc(artwork_info->num_dynamic_file_list_entries *
+		     artwork_info->sizeof_artwork_list_entry);
+  }
+
+  if (extra_file_list != NULL &&
+      options.verbose && IS_PARENT_PROCESS(audio.mixer_pid))
+  {
+    boolean dynamic_tokens_found = FALSE;
+    boolean unknown_tokens_found = FALSE;
+
+    for (list = extra_file_list; list != NULL; list = list->next)
+    {
+      if (strcmp(list->value, known_token_value) == 0)
+	dynamic_tokens_found = TRUE;
+      else
+	unknown_tokens_found = TRUE;
+    }
+
+#if DEBUG
+    if (dynamic_tokens_found)
+    {
+      Error(ERR_RETURN_LINE, "-");
+      Error(ERR_RETURN, "dynamic token(s) found:");
+
+      for (list = extra_file_list; list != NULL; list = list->next)
+	if (strcmp(list->value, known_token_value) == 0)
+	  Error(ERR_RETURN, "- dynamic token: '%s'", list->token);
+
+      Error(ERR_RETURN_LINE, "-");
+    }
+#endif
+
+    if (unknown_tokens_found)
+    {
+      Error(ERR_RETURN_LINE, "-");
+      Error(ERR_RETURN, "warning: unknown token(s) found in config file:");
+      Error(ERR_RETURN, "- config file: '%s'", filename);
+
+      for (list = extra_file_list; list != NULL; list = list->next)
+	if (strcmp(list->value, known_token_value) != 0)
+	  Error(ERR_RETURN, "- unknown token: '%s'", list->token);
+
+      Error(ERR_RETURN_LINE, "-");
+    }
+  }
+
   freeSetupFileList(extra_file_list);
 
 #if 0
@@ -1931,10 +2136,6 @@ static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info,
 			      struct ListNodeInfo **listnode,
 			      char *basename)
 {
-#if 0
-  char *filename = getCustomArtworkFilename(basename, artwork_info->type);
-#endif
-
 #if 0
   printf("GOT CUSTOM ARTWORK FILE '%s'\n", filename);
 #endif
@@ -1945,33 +2146,30 @@ static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info,
     return;
   }
 
-#if 0
-  if (filename == NULL)
-  {
-    Error(ERR_WARN, "cannot find artwork file '%s'", basename);
-    return;
-  }
-
-  replaceArtworkListEntry(artwork_info, listnode, filename);
-#else
   replaceArtworkListEntry(artwork_info, listnode, basename);
-#endif
 }
 
 static void LoadArtworkToList(struct ArtworkListInfo *artwork_info,
+			      struct ListNodeInfo **listnode,
 			      char *basename, int list_pos)
 {
+#if 0
   if (artwork_info->artwork_list == NULL ||
       list_pos >= artwork_info->num_file_list_entries)
     return;
+#endif
 
 #if 0
   printf("loading artwork '%s' ...  [%d]\n",
 	 basename, getNumNodes(artwork_info->content_list));
 #endif
 
+#if 1
+  LoadCustomArtwork(artwork_info, listnode, basename);
+#else
   LoadCustomArtwork(artwork_info, &artwork_info->artwork_list[list_pos],
 		    basename);
+#endif
 
 #if 0
   printf("loading artwork '%s' done [%d]\n",
@@ -1981,70 +2179,53 @@ static void LoadArtworkToList(struct ArtworkListInfo *artwork_info,
 
 void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info)
 {
-#if 0
-  static struct
-  {
-    char *text;
-    boolean do_it;
-  }
-  draw_init[] =
-  {
-    { "",			FALSE },
-    { "Loading graphics:",	TRUE },
-    { "Loading sounds:",	TRUE },
-    { "Loading music:",		TRUE }
-  };
-#endif
-
-  int num_file_list_entries = artwork_info->num_file_list_entries;
   struct FileInfo *file_list = artwork_info->file_list;
+  struct FileInfo *dynamic_file_list = artwork_info->dynamic_file_list;
+  int num_file_list_entries = artwork_info->num_file_list_entries;
+  int num_dynamic_file_list_entries =
+    artwork_info->num_dynamic_file_list_entries;
   int i;
 
 #if 0
-  LoadArtworkConfig(artwork_info);
-#endif
-
-#if 0
-  if (draw_init[artwork_info->type].do_it)
-    DrawInitText(draw_init[artwork_info->type].text, 120, FC_GREEN);
-#endif
-
-#if 0
-  printf("DEBUG: reloading %d artwork files ...\n", num_file_list_entries);
+  printf("DEBUG: reloading %d static artwork files ...\n",
+	 num_file_list_entries);
+  printf("DEBUG: reloading %d dynamic artwork files ...\n",
+	 num_dynamic_file_list_entries);
 #endif
 
   for(i=0; i<num_file_list_entries; i++)
-  {
-#if 0
-    if (draw_init[artwork_info->type].do_it)
-      DrawInitText(file_list[i].token, 150, FC_YELLOW);
-#endif
-
-    LoadArtworkToList(artwork_info, file_list[i].filename, i);
-
-#if 0
-    printf("DEBUG:   loading artwork file '%s'...\n", file_list[i].filename);
-#endif
-  }
-
-#if 0
-  draw_init[artwork_info->type].do_it = FALSE;
-#endif
+    LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i],
+		      file_list[i].filename, i);
 
-  /*
-  printf("list size == %d\n", getNumNodes(artwork_info->content_list));
-  */
+  for(i=0; i<num_dynamic_file_list_entries; i++)
+    LoadArtworkToList(artwork_info, &artwork_info->dynamic_artwork_list[i],
+		      dynamic_file_list[i].filename, i);
 
 #if 0
   dumpList(artwork_info->content_list);
 #endif
 }
 
-void FreeCustomArtworkList(struct ArtworkListInfo *artwork_info)
+static void FreeCustomArtworkList(struct ArtworkListInfo *artwork_info,
+				  struct ListNodeInfo ***list,
+				  int *num_list_entries)
 {
   int i;
 
-  if (artwork_info == NULL || artwork_info->artwork_list == NULL)
+  if (*list == NULL)
+    return;
+
+  for(i=0; i<*num_list_entries; i++)
+    deleteArtworkListEntry(artwork_info, &(*list)[i]);
+  free(*list);
+
+  *list = NULL;
+  *num_list_entries = 0;
+}
+
+void FreeCustomArtworkLists(struct ArtworkListInfo *artwork_info)
+{
+  if (artwork_info == NULL)
     return;
 
 #if 0
@@ -2052,18 +2233,16 @@ void FreeCustomArtworkList(struct ArtworkListInfo *artwork_info)
 	 IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
 #endif
 
-  for(i=0; i<artwork_info->num_file_list_entries; i++)
-    deleteArtworkListEntry(artwork_info, &artwork_info->artwork_list[i]);
+  FreeCustomArtworkList(artwork_info, &artwork_info->artwork_list,
+			&artwork_info->num_file_list_entries);
+
+  FreeCustomArtworkList(artwork_info, &artwork_info->dynamic_artwork_list,
+			&artwork_info->num_dynamic_file_list_entries);
 
 #if 0
   printf("%s: FREEING ARTWORK -- DONE\n",
 	 IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
 #endif
-
-  free(artwork_info->artwork_list);
-
-  artwork_info->artwork_list = NULL;
-  artwork_info->num_file_list_entries = 0;
 }