X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=b6ec4fda6353c2494c1c15f0eeca311ea6733887;hb=5a5342a6ab48037839b783adc4f3304331834a8c;hp=5356258904290413bcc1648f3897247b031da5eb;hpb=ba0568bc8d5b8b3d081691b8e987f2b66a4c13e6;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 53562589..b6ec4fda 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); @@ -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 */ @@ -529,6 +537,11 @@ void GetOptions(char *argv[]) options.verbose = FALSE; options.debug = FALSE; +#if !defined(PLATFORM_UNIX) + if (*options_left == NULL) /* no options given -- enable verbose mode */ + options.verbose = TRUE; +#endif + while (*options_left) { char option_str[MAX_OPTION_LEN]; @@ -1499,14 +1512,83 @@ boolean FileIsArtworkType(char *basename, int type) /* functions for loading artwork configuration information */ /* ------------------------------------------------------------------------- */ -static int get_parameter_value(int type, char *value) +/* This function checks if a string of the format "string1, string2, ..." + exactly contains a string . */ + +static boolean string_has_parameter(char *s, char *s_contained) { - 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); + char *substring; + + if (s == NULL || s_contained == NULL) + return FALSE; + + if (strlen(s_contained) > strlen(s)) + return FALSE; + + if (strncmp(s, s_contained, strlen(s_contained)) == 0) + { + char next_char = s[strlen(s_contained)]; + + /* check if next character is delimiter or whitespace */ + return (next_char == ',' || next_char == '\0' || + next_char == ' ' || next_char == '\t' ? TRUE : FALSE); + } + + /* check if string contains another parameter string after a comma */ + substring = strchr(s, ','); + if (substring == NULL) /* string does not contain a comma */ + return FALSE; + + /* advance string pointer to next character after the comma */ + substring++; + + /* skip potential whitespaces after the comma */ + while (*substring == ' ' || *substring == '\t') + substring++; + + return string_has_parameter(substring, s_contained); } +int get_parameter_value(char *token, char *value_raw, int type) +{ + char *value = getStringToLower(value_raw); + int result = 0; /* probably a save default value */ + + if (strcmp(token, ".direction") == 0) + { + result = (strcmp(value, "left") == 0 ? MV_LEFT : + strcmp(value, "right") == 0 ? MV_RIGHT : + strcmp(value, "up") == 0 ? MV_UP : + strcmp(value, "down") == 0 ? MV_DOWN : MV_NO_MOVING); + } + else if (strcmp(token, ".anim_mode") == 0) + { + result = (string_has_parameter(value, "loop") ? ANIM_LOOP : + string_has_parameter(value, "linear") ? ANIM_LINEAR : + string_has_parameter(value, "pingpong") ? ANIM_PINGPONG : + string_has_parameter(value, "pingpong2") ? ANIM_PINGPONG2 : + string_has_parameter(value, "random") ? ANIM_RANDOM : + ANIM_LOOP); + + if (string_has_parameter(value, "reverse")) + result |= ANIM_REVERSE; + } + else /* generic parameter of type integer or boolean */ + { + result = (strcmp(value, ARG_UNDEFINED) == 0 ? ARG_UNDEFINED_VALUE : + type == TYPE_INTEGER ? get_integer_from_string(value) : + type == TYPE_BOOLEAN ? get_boolean_from_string(value) : + ARG_UNDEFINED_VALUE); + } + + free(value); + + return result; +} + +static void FreeCustomArtworkList(struct ArtworkListInfo *, + struct ListNodeInfo ***, int *); + struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, struct ConfigInfo *suffix_list, int num_file_list_entries) @@ -1514,7 +1596,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)); @@ -1526,27 +1608,26 @@ 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 0) @@ -1607,28 +1693,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()) + 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]" @@ -1644,19 +1734,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++) @@ -1666,8 +1756,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); @@ -1677,6 +1766,53 @@ 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(char *); + +#if 0 + if (IS_PARENT_PROCESS()) + 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->filename = NULL; + 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 ext3_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->ext3_index = ext3_index; + + new_list_entry->artwork_index = artwork_index; +} + void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) { struct FileInfo *file_list = artwork_info->file_list; @@ -1684,17 +1820,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); @@ -1703,12 +1843,38 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) /* always start with reliable default values */ for (i=0; idynamic_file_list != NULL) + { + for (i=0; inum_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; + + 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) @@ -1721,11 +1887,11 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) for (i=0; inext) { if (strcmp(list->value, known_token_value) != 0) @@ -1740,72 +1906,261 @@ 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()) + { + 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 0: search for matching base prefix ---------- */ + + start_pos = 0; + for (i=0; itoken; + 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, + suffix_list, + num_suffix_list_entries, + token); + add_property_mapping(property_mapping, + num_property_mapping_entries, + base_index, -1, -1, -1, + current_summarized_file_list_entry); + continue; + } + +#if 0 + if (IS_PARENT_PROCESS()) + printf("---> examining token '%s': search 1st suffix ...\n", token); +#endif + + /* ---------- step 1: search for matching first suffix ---------- */ - for (i=0; i examining token '%s': search 2nd suffix ...\n", token); +#endif + + /* ---------- step 2: search for matching second suffix ---------- */ + + for (k=0; k examining token '%s': search 3rd suffix ...\n",token); +#endif + + /* ---------- step 3: search for matching third suffix ---------- */ + + for (l=0; lnum_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()) + { + 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 +2286,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 +2296,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,89 +2329,73 @@ 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); #endif for(i=0; itype].do_it) - DrawInitText(file_list[i].token, 150, FC_YELLOW); -#endif - - LoadArtworkToList(artwork_info, file_list[i].filename, i); + LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i], + file_list[i].filename, i); #if 0 - printf("DEBUG: loading artwork file '%s'...\n", file_list[i].filename); + printf("DEBUG: reloading %d dynamic artwork files ...\n", + num_dynamic_file_list_entries); #endif - } -#if 0 - draw_init[artwork_info->type].do_it = FALSE; -#endif - - /* - printf("list size == %d\n", getNumNodes(artwork_info->content_list)); - */ + for(i=0; idynamic_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 printf("%s: FREEING ARTWORK ...\n", - IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT"); + IS_CHILD_PROCESS() ? "CHILD" : "PARENT"); #endif - for(i=0; inum_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"); + IS_CHILD_PROCESS() ? "CHILD" : "PARENT"); #endif - - free(artwork_info->artwork_list); - - artwork_info->artwork_list = NULL; - artwork_info->num_file_list_entries = 0; } @@ -2122,3 +2454,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"); + } +}