X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=f35620c237768cadcb77ac225d9bf8ba7c168bc0;hb=29fc833ae1b5e46a429a9fa82098e8ad94f6f400;hp=75fd4434af7eec24766de59fc2995b059db49c74;hpb=7119b5d2e756b1ab23818ea39d19aece0563bab0;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 75fd4434..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,46 +1537,31 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, for (i=0; i 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 '%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++) { @@ -1578,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) @@ -1663,17 +1661,13 @@ 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) { + 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); - - file_list_entry->filename = getStringCopy(filename); + setString(&file_list_entry->parameter[i], suffix_list[i].value); file_list_entry->redefined = TRUE; @@ -1681,8 +1675,7 @@ static void read_token_parameters(struct SetupFileList *setup_file_list, 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++) @@ -1692,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); @@ -1711,7 +1703,7 @@ 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()) @@ -1758,12 +1750,14 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) 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; @@ -1778,12 +1772,10 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) /* always start with reliable default values */ for (i=0; inext) @@ -2391,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"); + } +}