X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=f35620c237768cadcb77ac225d9bf8ba7c168bc0;hb=29fc833ae1b5e46a429a9fa82098e8ad94f6f400;hp=1473bc30e95d11935ad0d720bae82af0fd315996;hpb=c5ee7e4524f10322894b2547337e4c973a80a552;p=rocksndiamonds.git

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 1473bc30..f35620c2 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -475,6 +475,14 @@ char *getStringToLower(char *s)
   return s_copy;
 }
 
+void setString(char **old_value, char *new_value)
+{
+  if (*old_value != NULL)
+    free(*old_value);
+
+  *old_value = getStringCopy(new_value);
+}
+
 
 /* ------------------------------------------------------------------------- */
 /* command line option handling functions                                    */
@@ -1499,17 +1507,17 @@ 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)
+int get_parameter_value(int type, char *value)
 {
   return (strcmp(value, ARG_UNDEFINED) == 0 ? ARG_UNDEFINED_VALUE :
 	  type == TYPE_INTEGER ? get_integer_from_string(value) :
 	  type == TYPE_BOOLEAN ? get_boolean_from_string(value) :
-	  -1);
+	  ARG_UNDEFINED_VALUE);
 }
 
+static void FreeCustomArtworkList(struct ArtworkListInfo *,
+				  struct ListNodeInfo ***, int *);
+
 struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
 					   struct ConfigInfo *suffix_list,
 					   int num_file_list_entries)
@@ -1517,7 +1525,7 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
   struct FileInfo *file_list;
   int num_file_list_entries_found = 0;
   int num_suffix_list_entries = 0;
-  int list_pos = 0;
+  int list_pos;
   int i, j;
 
   file_list = checked_calloc(num_file_list_entries * sizeof(struct FileInfo));
@@ -1529,27 +1537,26 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
   for (i=0; i<num_file_list_entries; i++)
   {
     file_list[i].token = NULL;
+
     file_list[i].default_filename = NULL;
     file_list[i].filename = NULL;
 
     if (num_suffix_list_entries > 0)
     {
-      int parameter_array_size = num_suffix_list_entries * sizeof(int);
+      int parameter_array_size = num_suffix_list_entries * sizeof(char *);
 
       file_list[i].default_parameter = checked_calloc(parameter_array_size);
       file_list[i].parameter = checked_calloc(parameter_array_size);
 
       for (j=0; j<num_suffix_list_entries; j++)
       {
-	int default_parameter =
-	  get_parameter_value(suffix_list[j].type, suffix_list[j].value);
-
-	file_list[i].default_parameter[j] = default_parameter;
-	file_list[i].parameter[j] = default_parameter;
+	setString(&file_list[i].default_parameter[j], suffix_list[j].value);
+	setString(&file_list[i].parameter[j], suffix_list[j].value);
       }
     }
   }
 
+  list_pos = 0;
   for (i=0; config_list[i].token != NULL; i++)
   {
     int len_config_token = strlen(config_list[i].token);
@@ -1564,14 +1571,19 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
 	  strcmp(&config_list[i].token[len_config_token - len_suffix],
 		 suffix_list[j].token) == 0)
       {
-	file_list[list_pos].default_parameter[j] =
-	  get_parameter_value(suffix_list[j].type, config_list[i].value);
+	setString(&file_list[list_pos].default_parameter[j],
+		  config_list[i].value);
 
 	is_file_entry = FALSE;
 	break;
       }
     }
 
+    /* the following tokens are no file definitions, but other config tokens */
+    if (strcmp(config_list[i].token, "global.num_toons") == 0 ||
+	strcmp(config_list[i].token, "menu.main.hide_static_text") == 0)
+      is_file_entry = FALSE;
+
     if (is_file_entry)
     {
       if (i > 0)
@@ -1616,7 +1628,7 @@ static boolean token_suffix_match(char *token, char *suffix, int start_pos)
   int len_suffix = strlen(suffix);
 
 #if 0
-  if (IS_PARENT_PROCESS(audio.mixer_pid))
+  if (IS_PARENT_PROCESS())
     printf(":::::::::: check '%s' for '%s' ::::::::::\n", token, suffix);
 #endif
 
@@ -1651,19 +1663,19 @@ static void read_token_parameters(struct SetupFileList *setup_file_list,
 
   if (filename != NULL)
   {
+    setString(&file_list_entry->filename, filename);
+
     /* when file definition found, set all parameters to default values */
     for (i=0; suffix_list[i].token != NULL; i++)
-      file_list_entry->parameter[i] =
-	get_parameter_value(suffix_list[i].type, suffix_list[i].value);
+      setString(&file_list_entry->parameter[i], suffix_list[i].value);
 
-    file_list_entry->filename = getStringCopy(filename);
+    file_list_entry->redefined = TRUE;
 
     /* mark config file token as well known from default config */
     setTokenValue(setup_file_list, file_list_entry->token, known_token_value);
   }
   else
-    file_list_entry->filename =
-      getStringCopy(file_list_entry->default_filename);
+    setString(&file_list_entry->filename, file_list_entry->default_filename);
 
   /* check for config tokens that can be build by base token and suffixes */
   for (i=0; suffix_list[i].token != NULL; i++)
@@ -1673,8 +1685,7 @@ static void read_token_parameters(struct SetupFileList *setup_file_list,
 
     if (value != NULL)
     {
-      file_list_entry->parameter[i] =
-	get_parameter_value(suffix_list[i].type, value);
+      setString(&file_list_entry->parameter[i], value);
 
       /* mark config file token as well known from default config */
       setTokenValue(setup_file_list, token, known_token_value);
@@ -1692,10 +1703,10 @@ static void add_dynamic_file_list_entry(struct FileInfo **list,
 					char *token)
 {
   struct FileInfo *new_list_entry;
-  int parameter_array_size = num_suffix_list_entries * sizeof(int);
+  int parameter_array_size = num_suffix_list_entries * sizeof(char *);
 
 #if 0
-  if (IS_PARENT_PROCESS(audio.mixer_pid))
+  if (IS_PARENT_PROCESS())
     printf("===> found dynamic definition '%s'\n", token);
 #endif
 
@@ -1704,6 +1715,7 @@ static void add_dynamic_file_list_entry(struct FileInfo **list,
   new_list_entry = &(*list)[*num_list_entries - 1];
 
   new_list_entry->token = getStringCopy(token);
+  new_list_entry->filename = NULL;
   new_list_entry->parameter = checked_calloc(parameter_array_size);
 
   read_token_parameters(extra_file_list, suffix_list, new_list_entry);
@@ -1711,7 +1723,8 @@ static void add_dynamic_file_list_entry(struct FileInfo **list,
 
 static void add_property_mapping(struct PropertyMapping **list,
 				 int *num_list_entries,
-				 int base_index, int ext1_index,int ext2_index,
+				 int base_index, int ext1_index,
+				 int ext2_index, int ext3_index,
 				 int artwork_index)
 {
   struct PropertyMapping *new_list_entry;
@@ -1724,6 +1737,7 @@ static void add_property_mapping(struct PropertyMapping **list,
   new_list_entry->base_index = base_index;
   new_list_entry->ext1_index = ext1_index;
   new_list_entry->ext2_index = ext2_index;
+  new_list_entry->ext3_index = ext3_index;
 
   new_list_entry->artwork_index = artwork_index;
 }
@@ -1735,17 +1749,21 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
   char **base_prefixes = artwork_info->base_prefixes;
   char **ext1_suffixes = artwork_info->ext1_suffixes;
   char **ext2_suffixes = artwork_info->ext2_suffixes;
+  char **ext3_suffixes = artwork_info->ext3_suffixes;
+  char **ignore_tokens = artwork_info->ignore_tokens;
   int num_file_list_entries = artwork_info->num_file_list_entries;
   int num_suffix_list_entries = artwork_info->num_suffix_list_entries;
   int num_base_prefixes = artwork_info->num_base_prefixes;
   int num_ext1_suffixes = artwork_info->num_ext1_suffixes;
   int num_ext2_suffixes = artwork_info->num_ext2_suffixes;
+  int num_ext3_suffixes = artwork_info->num_ext3_suffixes;
+  int num_ignore_tokens = artwork_info->num_ignore_tokens;
   char *filename = getCustomArtworkConfigFilename(artwork_info->type);
   struct SetupFileList *setup_file_list;
   struct SetupFileList *extra_file_list = NULL;
   struct SetupFileList *list;
   char *known_token_value = KNOWN_TOKEN_VALUE;
-  int i, j, k;
+  int i, j, k, l;
 
 #if 0
   printf("GOT CUSTOM ARTWORK CONFIG FILE '%s'\n", filename);
@@ -1754,12 +1772,12 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
   /* always start with reliable default values */
   for (i=0; i<num_file_list_entries; i++)
   {
-    if (file_list[i].filename != NULL)
-      free(file_list[i].filename);
-    file_list[i].filename = NULL;
+    setString(&file_list[i].filename, file_list[i].default_filename);
 
     for (j=0; j<num_suffix_list_entries; j++)
-      file_list[i].parameter[j] = file_list[i].default_parameter[j];
+      setString(&file_list[i].parameter[j], file_list[i].default_parameter[j]);
+
+    file_list[i].redefined = FALSE;
   }
 
   /* free previous dynamic artwork file array */
@@ -1773,9 +1791,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
     }
 
     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);
@@ -1800,9 +1816,9 @@ 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 all known tokens to "known" keyword */
-  setTokenValue(setup_file_list, "name", known_token_value);
-  setTokenValue(setup_file_list, "sort_priority", known_token_value);
+  /* set all tokens that can be ignored here to "known" keyword */
+  for (i=0; i < num_ignore_tokens; i++)
+    setTokenValue(setup_file_list, ignore_tokens[i], known_token_value);
 
   /* copy all unknown config file tokens to extra config list */
   for (list = setup_file_list; list != NULL; list = list->next)
@@ -1850,7 +1866,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
     }
 
 #if 0
-    if (IS_PARENT_PROCESS(audio.mixer_pid))
+    if (IS_PARENT_PROCESS())
     {
       if (parameter_suffix_found)
 	printf("---> skipping token '%s' (parameter token)\n", token);
@@ -1862,7 +1878,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
     if (parameter_suffix_found)
       continue;
 
-    /* ---------- step 1: search for matching base prefix ---------- */
+    /* ---------- step 0: search for matching base prefix ---------- */
 
     start_pos = 0;
     for (i=0; i<num_base_prefixes && !base_prefix_found; i++)
@@ -1870,14 +1886,25 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
       char *base_prefix = base_prefixes[i];
       int len_base_prefix = strlen(base_prefix);
       boolean ext1_suffix_found = FALSE;
+      boolean ext2_suffix_found = FALSE;
+      boolean ext3_suffix_found = FALSE;
+      boolean exact_match = FALSE;
+      int base_index = -1;
+      int ext1_index = -1;
+      int ext2_index = -1;
+      int ext3_index = -1;
 
       base_prefix_found = token_suffix_match(token, base_prefix, start_pos);
 
       if (!base_prefix_found)
 	continue;
 
+      base_index = i;
+
       if (start_pos + len_base_prefix == len_token)	/* exact match */
       {
+	exact_match = TRUE;
+
 	add_dynamic_file_list_entry(dynamic_file_list,
 				    num_dynamic_file_list_entries,
 				    extra_file_list,
@@ -1886,32 +1913,35 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
 				    token);
 	add_property_mapping(property_mapping,
 			     num_property_mapping_entries,
-			     i, -1, -1,
+			     base_index, -1, -1, -1,
 			     current_summarized_file_list_entry);
 	continue;
       }
 
 #if 0
-      if (IS_PARENT_PROCESS(audio.mixer_pid))
+      if (IS_PARENT_PROCESS())
 	printf("---> examining token '%s': search 1st suffix ...\n", token);
 #endif
 
-      /* ---------- step 2: search for matching first suffix ---------- */
+      /* ---------- step 1: search for matching first suffix ---------- */
 
       start_pos += len_base_prefix;
       for (j=0; j<num_ext1_suffixes && !ext1_suffix_found; j++)
       {
 	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;
 
+	ext1_index = j;
+
 	if (start_pos + len_ext1_suffix == len_token)	/* exact match */
 	{
+	  exact_match = TRUE;
+
 	  add_dynamic_file_list_entry(dynamic_file_list,
 				      num_dynamic_file_list_entries,
 				      extra_file_list,
@@ -1920,43 +1950,93 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
 				      token);
 	  add_property_mapping(property_mapping,
 			       num_property_mapping_entries,
-			       i, j, -1,
+			       base_index, ext1_index, -1, -1,
 			       current_summarized_file_list_entry);
 	  continue;
 	}
 
+	start_pos += len_ext1_suffix;
+      }
+
+      if (exact_match)
+	break;
+
 #if 0
-	if (IS_PARENT_PROCESS(audio.mixer_pid))
-	  printf("---> examining token '%s': search 2nd suffix ...\n", token);
+      if (IS_PARENT_PROCESS())
+	printf("---> examining token '%s': search 2nd suffix ...\n", token);
 #endif
 
-	/* ---------- step 3: search for matching second suffix ---------- */
+      /* ---------- step 2: search for matching second suffix ---------- */
 
-	start_pos += len_ext1_suffix;
-	for (k=0; k<num_ext2_suffixes && !ext2_suffix_found; k++)
+      for (k=0; k<num_ext2_suffixes && !ext2_suffix_found; k++)
+      {
+	char *ext2_suffix = ext2_suffixes[k];
+	int len_ext2_suffix = strlen(ext2_suffix);
+
+	ext2_suffix_found = token_suffix_match(token, ext2_suffix,start_pos);
+
+	if (!ext2_suffix_found)
+	  continue;
+
+	ext2_index = k;
+
+	if (start_pos + len_ext2_suffix == len_token)	/* exact match */
+	{
+	  exact_match = TRUE;
+
+	  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,
+			       base_index, ext1_index, ext2_index, -1,
+			       current_summarized_file_list_entry);
+	  continue;
+	}
+
+	start_pos += len_ext2_suffix;
+      }
+
+      if (exact_match)
+	break;
+
+#if 0
+      if (IS_PARENT_PROCESS())
+	printf("---> examining token '%s': search 3rd suffix ...\n",token);
+#endif
+
+      /* ---------- step 3: search for matching third suffix ---------- */
+
+      for (l=0; l<num_ext3_suffixes && !ext3_suffix_found; l++)
+      {
+	char *ext3_suffix = ext3_suffixes[l];
+	int len_ext3_suffix = strlen(ext3_suffix);
+
+	ext3_suffix_found =token_suffix_match(token,ext3_suffix,start_pos);
+
+	if (!ext3_suffix_found)
+	  continue;
+
+	ext3_index = l;
+
+	if (start_pos + len_ext3_suffix == len_token) /* exact match */
 	{
-	  char *ext2_suffix = ext2_suffixes[k];
-	  int len_ext2_suffix = strlen(ext2_suffix);
-
-	  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 */
-	  {
-	    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;
-	  }
+	  exact_match = TRUE;
+
+	  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,
+			       base_index, ext1_index, ext2_index, ext3_index,
+			       current_summarized_file_list_entry);
+	  continue;
 	}
       }
     }
@@ -1969,8 +2049,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
 		     artwork_info->sizeof_artwork_list_entry);
   }
 
-  if (extra_file_list != NULL &&
-      options.verbose && IS_PARENT_PROCESS(audio.mixer_pid))
+  if (extra_file_list != NULL && options.verbose && IS_PARENT_PROCESS())
   {
     boolean dynamic_tokens_found = FALSE;
     boolean unknown_tokens_found = FALSE;
@@ -2189,14 +2268,17 @@ void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info)
 #if 0
   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++)
     LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i],
 		      file_list[i].filename, i);
 
+#if 0
+  printf("DEBUG: reloading %d dynamic artwork files ...\n",
+	 num_dynamic_file_list_entries);
+#endif
+
   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);
@@ -2230,7 +2312,7 @@ void FreeCustomArtworkLists(struct ArtworkListInfo *artwork_info)
 
 #if 0
   printf("%s: FREEING ARTWORK ...\n",
-	 IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
+	 IS_CHILD_PROCESS() ? "CHILD" : "PARENT");
 #endif
 
   FreeCustomArtworkList(artwork_info, &artwork_info->artwork_list,
@@ -2241,7 +2323,7 @@ void FreeCustomArtworkLists(struct ArtworkListInfo *artwork_info)
 
 #if 0
   printf("%s: FREEING ARTWORK -- DONE\n",
-	 IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
+	 IS_CHILD_PROCESS() ? "CHILD" : "PARENT");
 #endif
 }
 
@@ -2301,3 +2383,20 @@ void debug_print_timestamp(int counter_nr, char *message)
 
   counter[counter_nr][1] = Counter();
 }
+
+void debug_print_parent_only(char *format, ...)
+{
+  if (!IS_PARENT_PROCESS())
+    return;
+
+  if (format)
+  {
+    va_list ap;
+
+    va_start(ap, format);
+    vprintf(format, ap);
+    va_end(ap);
+
+    printf("\n");
+  }
+}