X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=0b1382fa8bd2ef18ab5c6ca5e26111bfecd938e9;hb=756a24e132e64d1514e85b8fa09f123e75417fd0;hp=32910410bff9d25d3732813e85091a0fae53f269;hpb=ab0c2cf87c09fdc785f5124640a9f3334bb3a4b4;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 32910410..0b1382fa 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 */ @@ -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,17 +1512,83 @@ boolean FileIsArtworkType(char *basename, int type) /* functions for loading artwork configuration information */ /* ------------------------------------------------------------------------- */ -static void FreeCustomArtworkList(struct ArtworkListInfo *, - struct ListNodeInfo ***, int *); +/* This function checks if a string of the format "string1, string2, ..." + exactly contains a string . */ -static int get_parameter_value(int type, char *value) +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_NONE); + + 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) @@ -1517,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)); @@ -1529,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) @@ -1616,7 +1699,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 +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++) @@ -1673,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); @@ -1692,10 +1774,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 +1786,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 +1794,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 +1808,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 +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); @@ -1754,12 +1843,12 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) /* always start with reliable default values */ for (i=0; inext) @@ -1848,7 +1937,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); @@ -1860,7 +1949,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 +2339,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 +2383,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 +2394,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 } @@ -2299,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"); + } +}