X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=31138a682a1f68677556bac20fdedf814af3a79d;hb=3683bbbe90156d2a9ab32de08099e094a446e5f8;hp=d0bc9fa9401067173c21224ceedbb687af35015d;hpb=4fcf5c6436d34bdc44bc534d21d9ec95bf072333;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index d0bc9fa9..31138a68 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -32,6 +32,60 @@ #include "text.h" +/* ------------------------------------------------------------------------- */ +/* some generic helper functions */ +/* ------------------------------------------------------------------------- */ + +void fprintf_line(FILE *stream, char *line_string, int line_length) +{ + int i; + + for (i=0; i 20) + size = 20; + + if (size) + { + sprintf(s, " %09d", number); + return &s[strlen(s) - size]; + } + else + { + sprintf(s, "%d", number); + return s; + } +} + + +/* ------------------------------------------------------------------------- */ +/* counter functions */ +/* ------------------------------------------------------------------------- */ + #if defined(PLATFORM_MSDOS) volatile unsigned long counter = 0; @@ -202,35 +256,10 @@ void WaitUntilDelayReached(unsigned long *counter_var, unsigned long delay) *counter_var = actual_counter; } -/* int2str() returns a number converted to a string; - the used memory is static, but will be overwritten by later calls, - so if you want to save the result, copy it to a private string buffer; - there can be 10 local calls of int2str() without buffering the result -- - the 11th call will then destroy the result from the first call and so on. -*/ - -char *int2str(int number, int size) -{ - static char shift_array[10][40]; - static int shift_counter = 0; - char *s = shift_array[shift_counter]; - shift_counter = (shift_counter + 1) % 10; - - if (size > 20) - size = 20; - - if (size) - { - sprintf(s, " %09d", number); - return &s[strlen(s) - size]; - } - else - { - sprintf(s, "%d", number); - return s; - } -} +/* ------------------------------------------------------------------------- */ +/* random generator functions */ +/* ------------------------------------------------------------------------- */ unsigned int SimpleRND(unsigned int max) { @@ -302,6 +331,11 @@ unsigned int InitRND(long seed) #endif } + +/* ------------------------------------------------------------------------- */ +/* system info functions */ +/* ------------------------------------------------------------------------- */ + char *getLoginName() { #if defined(PLATFORM_WIN32) @@ -384,6 +418,11 @@ char *getHomeDir() #endif } + +/* ------------------------------------------------------------------------- */ +/* various string functions */ +/* ------------------------------------------------------------------------- */ + char *getPath2(char *path1, char *path2) { char *complete_path = checked_malloc(strlen(path1) + 1 + @@ -436,6 +475,11 @@ char *getStringToLower(char *s) return s_copy; } + +/* ------------------------------------------------------------------------- */ +/* command line option handling functions */ +/* ------------------------------------------------------------------------- */ + static void printUsage() { printf("\n" @@ -631,6 +675,11 @@ void GetOptions(char *argv[]) } } + +/* ------------------------------------------------------------------------- */ +/* error handling functions */ +/* ------------------------------------------------------------------------- */ + /* used by SetError() and GetError() to store internal error messages */ static char internal_error[1024]; /* this is bad */ @@ -650,6 +699,7 @@ char *GetError() void Error(int mode, char *format, ...) { + static boolean last_line_was_separator = FALSE; char *process_name = ""; FILE *error = stderr; char *newline = "\n"; @@ -658,6 +708,18 @@ void Error(int mode, char *format, ...) if (mode & ERR_WARN && !options.verbose) return; + if (mode == ERR_RETURN_LINE) + { + if (!last_line_was_separator) + fprintf_line(error, format, 79); + + last_line_was_separator = TRUE; + + return; + } + + last_line_was_separator = FALSE; + #if defined(PLATFORM_MSDOS) newline = "\r\n"; @@ -711,6 +773,11 @@ void Error(int mode, char *format, ...) } } + +/* ------------------------------------------------------------------------- */ +/* memory allocation functions */ +/* ------------------------------------------------------------------------- */ + void *checked_malloc(unsigned long size) { void *ptr; @@ -745,6 +812,11 @@ void *checked_realloc(void *ptr, unsigned long size) return ptr; } + +/* ------------------------------------------------------------------------- */ +/* various helper functions */ +/* ------------------------------------------------------------------------- */ + inline void swap_numbers(int *i1, int *i2) { int help = *i1; @@ -1292,9 +1364,9 @@ boolean get_boolean_from_string(char *s) } -/* ========================================================================= */ +/* ------------------------------------------------------------------------- */ /* functions for generic lists */ -/* ========================================================================= */ +/* ------------------------------------------------------------------------- */ ListNode *newListNode() { @@ -1372,9 +1444,9 @@ void dumpList(ListNode *node_first) } -/* ========================================================================= */ +/* ------------------------------------------------------------------------- */ /* functions for checking filenames */ -/* ========================================================================= */ +/* ------------------------------------------------------------------------- */ boolean FileIsGraphic(char *filename) { @@ -1423,13 +1495,17 @@ boolean FileIsArtworkType(char *basename, int type) return FALSE; } -/* ========================================================================= */ +/* ------------------------------------------------------------------------- */ /* functions for loading artwork configuration information */ -/* ========================================================================= */ +/* ------------------------------------------------------------------------- */ + +static void FreeCustomArtworkList(struct ArtworkListInfo *, + struct ListNodeInfo ***, int *); static int get_parameter_value(int type, char *value) { - return (type == TYPE_INTEGER ? get_integer_from_string(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); } @@ -1522,6 +1598,7 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, num_file_list_entries_found = list_pos + 1; if (num_file_list_entries_found != num_file_list_entries) { + Error(ERR_RETURN_LINE, "-"); Error(ERR_RETURN, "inconsistant config list information:"); Error(ERR_RETURN, "- should be: %d (according to 'src/conf_gfx.h')", num_file_list_entries); @@ -1533,83 +1610,123 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, return file_list; } -#if 0 -static void CheckArtworkConfig(struct ArtworkListInfo *artwork_info) +static boolean token_suffix_match(char *token, char *suffix, int start_pos) { - struct FileInfo *file_list = artwork_info->file_list; - struct ConfigInfo *suffix_list = artwork_info->suffix_list; - int num_file_list_entries = artwork_info->num_file_list_entries; - int num_suffix_list_entries = artwork_info->num_suffix_list_entries; - char *filename = getCustomArtworkConfigFilename(artwork_info->type); - struct SetupFileList *setup_file_list; - char *known_token_value = "[KNOWN_TOKEN]"; - int i, j; + int len_token = strlen(token); + int len_suffix = strlen(suffix); - if (!options.verbose) - return; +#if 0 + if (IS_PARENT_PROCESS(audio.mixer_pid)) + printf(":::::::::: check '%s' for '%s' ::::::::::\n", token, suffix); +#endif - if (filename == NULL) - return; + if (start_pos < 0) /* compare suffix from end of string */ + start_pos += len_token; - if ((setup_file_list = loadSetupFileList(filename)) == NULL) - return; + if (start_pos < 0 || start_pos + len_suffix > len_token) + return FALSE; - for (i=0; itoken); + char *known_token_value = KNOWN_TOKEN_VALUE; + int i; + + if (filename != NULL) { - if (strcmp(setup_file_list->value, known_token_value) != 0) + /* 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); + + /* 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); + + /* check for config tokens that can be build by base token and suffixes */ + for (i=0; suffix_list[i].token != NULL; i++) + { + char *token = getStringCat2(file_list_entry->token, suffix_list[i].token); + char *value = getTokenValue(setup_file_list, token); + + if (value != NULL) { - Error(ERR_RETURN, "custom artwork configuration warning:"); - Error(ERR_RETURN, "- config file: '%s'", filename); - Error(ERR_RETURN, "- config token: '%s'", setup_file_list->token); - Error(ERR_WARN, "token not recognized"); + file_list_entry->parameter[i] = + get_parameter_value(suffix_list[i].type, value); + + /* mark config file token as well known from default config */ + setTokenValue(setup_file_list, token, known_token_value); } - setup_file_list = setup_file_list->next; + free(token); } - - freeSetupFileList(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(int); + +#if 0 + if (IS_PARENT_PROCESS(audio.mixer_pid)) + printf("===> found dynamic definition '%s'\n", token); #endif -static void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) + (*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->parameter = checked_calloc(parameter_array_size); + + read_token_parameters(extra_file_list, suffix_list, new_list_entry); +} + +void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) { struct FileInfo *file_list = artwork_info->file_list; struct ConfigInfo *suffix_list = artwork_info->suffix_list; + char **base_prefixes = artwork_info->base_prefixes; + char **ext1_suffixes = artwork_info->ext1_suffixes; + char **ext2_suffixes = artwork_info->ext2_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; char *filename = getCustomArtworkConfigFilename(artwork_info->type); struct SetupFileList *setup_file_list; - char *known_token_value = "[KNOWN_TOKEN]"; - int i, j; + struct SetupFileList *extra_file_list = NULL; + struct SetupFileList *list; + char *known_token_value = KNOWN_TOKEN_VALUE; + int i, j, k; #if 0 printf("GOT CUSTOM ARTWORK CONFIG FILE '%s'\n", filename); @@ -1626,72 +1743,227 @@ static void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) file_list[i].parameter[j] = file_list[i].default_parameter[j]; } + /* free previous dynamic artwork file array */ + if (artwork_info->dynamic_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; + artwork_info->num_dynamic_file_list_entries = 0; + + FreeCustomArtworkList(artwork_info, &artwork_info->dynamic_artwork_list, + &artwork_info->num_dynamic_file_list_entries); + } + if (filename == NULL) return; if ((setup_file_list = loadSetupFileList(filename)) == NULL) return; + /* read parameters for all known config file tokens */ for (i=0; inext) { - /* check for config token that is the base token without any suffixes */ - char *filename = getTokenValue(setup_file_list, file_list[i].token); + if (strcmp(list->value, known_token_value) != 0) + { + if (extra_file_list == NULL) + extra_file_list = newSetupFileList(list->token, list->value); + else + setTokenValue(extra_file_list, list->token, list->value); + } + } + + /* at this point, we do not need the config file list anymore -- free it */ + freeSetupFileList(setup_file_list); - if (filename != NULL) + /* now try to determine valid, dynamically defined config tokens */ + + for (list = extra_file_list; list != NULL; list = list->next) + { + struct FileInfo **dynamic_file_list = &artwork_info->dynamic_file_list; + int *num_dynamic_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++) { - for (j=0; j skipping token '%s' (parameter token)\n", token); + else + printf("---> examining token '%s': search prefix ...\n", token); } - else - file_list[i].filename = getStringCopy(file_list[i].default_filename); +#endif - /* check for config tokens that can be build by base token and suffixes */ - for (j=0; j examining token '%s': search 1st suffix ...\n", token); +#endif + + /* ---------- step 2: search for matching first suffix ---------- */ + + start_pos += len_base_prefix; + for (j=0; j examining token '%s': search 2nd suffix ...\n", token); +#endif + + /* ---------- step 3: search for matching second suffix ---------- */ + + start_pos += len_ext1_suffix; + for (k=0; knum_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 (options.verbose) + if (extra_file_list != NULL && + options.verbose && IS_PARENT_PROCESS(audio.mixer_pid)) { - /* check each token in config file if it is defined in default config */ - while (setup_file_list != NULL) + boolean dynamic_tokens_found = FALSE; + boolean unknown_tokens_found = FALSE; + + for (list = extra_file_list; list != NULL; list = list->next) { - if (strcmp(setup_file_list->value, known_token_value) != 0) - { - Error(ERR_RETURN, "custom artwork configuration warning:"); - Error(ERR_RETURN, "- config file: '%s'", filename); - Error(ERR_RETURN, "- config token: '%s'", setup_file_list->token); - Error(ERR_WARN, "token not recognized"); - } + if (strcmp(list->value, known_token_value) == 0) + dynamic_tokens_found = TRUE; + else + unknown_tokens_found = TRUE; + } - setup_file_list = setup_file_list->next; +#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(setup_file_list); + freeSetupFileList(extra_file_list); #if 0 for (i=0; itype); -#endif - #if 0 printf("GOT CUSTOM ARTWORK FILE '%s'\n", filename); #endif @@ -1830,33 +2098,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", @@ -1866,71 +2131,53 @@ 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 - CheckArtworkConfig(artwork_info); -#endif - LoadArtworkConfig(artwork_info); - -#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); + printf("DEBUG: reloading %d dynamic artwork files ...\n", + num_dynamic_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); - -#if 0 - printf("DEBUG: loading artwork file '%s'...\n", file_list[i].filename); -#endif - } - -#if 0 - draw_init[artwork_info->type].do_it = FALSE; -#endif + LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i], + file_list[i].filename, i); - /* - 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 @@ -1938,25 +2185,23 @@ void FreeCustomArtworkList(struct ArtworkListInfo *artwork_info) IS_CHILD_PROCESS(audio.mixer_pid) ? "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"); #endif - - free(artwork_info->artwork_list); - - artwork_info->artwork_list = NULL; - artwork_info->num_file_list_entries = 0; } -/* ========================================================================= */ +/* ------------------------------------------------------------------------- */ /* functions only needed for non-Unix (non-command-line) systems */ /* (MS-DOS only; SDL/Windows creates files "stdout.txt" and "stderr.txt") */ -/* ========================================================================= */ +/* ------------------------------------------------------------------------- */ #if defined(PLATFORM_MSDOS) @@ -1987,24 +2232,9 @@ void dumpErrorFile() #endif -/* ========================================================================= */ -/* some generic helper functions */ -/* ========================================================================= */ - -void printf_line(char line_char, int line_length) -{ - int i; - - for (i=0; i