X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=75fd4434af7eec24766de59fc2995b059db49c74;hb=7119b5d2e756b1ab23818ea39d19aece0563bab0;hp=32910410bff9d25d3732813e85091a0fae53f269;hpb=ab0c2cf87c09fdc785f5124640a9f3334bb3a4b4;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 32910410..75fd4434 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -1552,9 +1552,23 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, for (i=0; config_list[i].token != NULL; i++) { +#if 0 + int len_config_token; + int len_config_value; + boolean is_file_entry; + + printf("%d: '%s' => '%s'\n", + i, config_list[i].token, config_list[i].value); + + len_config_token = strlen(config_list[i].token); + len_config_value = strlen(config_list[i].value); + is_file_entry = TRUE; + +#else int len_config_token = strlen(config_list[i].token); int len_config_value = strlen(config_list[i].value); boolean is_file_entry = TRUE; +#endif for (j=0; suffix_list[j].token != NULL; j++) { @@ -1616,7 +1630,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 @@ -1649,6 +1663,9 @@ static void read_token_parameters(struct SetupFileList *setup_file_list, char *known_token_value = KNOWN_TOKEN_VALUE; int i; + if (file_list_entry->filename != NULL) + free(file_list_entry->filename); + if (filename != NULL) { /* when file definition found, set all parameters to default values */ @@ -1658,6 +1675,8 @@ static void read_token_parameters(struct SetupFileList *setup_file_list, 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); } @@ -1695,7 +1714,7 @@ static void add_dynamic_file_list_entry(struct FileInfo **list, int parameter_array_size = num_suffix_list_entries * sizeof(int); #if 0 - if (IS_PARENT_PROCESS(audio.mixer_pid)) + if (IS_PARENT_PROCESS()) printf("===> found dynamic definition '%s'\n", token); #endif @@ -1704,6 +1723,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 +1731,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 +1745,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 +1757,19 @@ 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; 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; 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); @@ -1756,10 +1780,12 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) { if (file_list[i].filename != NULL) free(file_list[i].filename); - file_list[i].filename = NULL; + file_list[i].filename = getStringCopy(file_list[i].default_filename); for (j=0; j skipping token '%s' (parameter token)\n", token); @@ -1860,7 +1886,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 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 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 examining token '%s': search 3rd suffix ...\n",token); +#endif + + /* ---------- step 3: search for matching third suffix ---------- */ + + for (l=0; lsizeof_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; @@ -2187,14 +2276,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; iartwork_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; idynamic_artwork_list[i], dynamic_file_list[i].filename, i); @@ -2228,7 +2320,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, @@ -2239,7 +2331,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 }