X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=f6cc110d4922e9e41be4fe8bae19fc1433919cab;hb=34ca525d659f14cec647449f4be8ee009a5bc267;hp=efb56bba2cfc6d9030c5de4e1be6dc74f151f9e4;hpb=e1fdeb57afb3db322b3757d8105c66ba33cadca4;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index efb56bba..f6cc110d 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -30,6 +30,7 @@ #include "setup.h" #include "random.h" #include "text.h" +#include "image.h" /* ------------------------------------------------------------------------- */ @@ -324,7 +325,7 @@ unsigned int init_random_number(int nr, long seed) unsigned int get_random_number(int nr, unsigned int max) { - return (random_linux_libc(nr) % max); + return (max > 0 ? random_linux_libc(nr) % max : 0); } @@ -332,6 +333,7 @@ unsigned int get_random_number(int nr, unsigned int max) /* system info functions */ /* ------------------------------------------------------------------------- */ +#if !defined(PLATFORM_MSDOS) static char *get_corrected_real_name(char *real_name) { char *real_name_new = checked_malloc(MAX_USERNAME_LEN + 1); @@ -364,6 +366,7 @@ static char *get_corrected_real_name(char *real_name) return real_name_new; } +#endif char *getLoginName() { @@ -981,26 +984,28 @@ void putFileChunk(FILE *file, char *chunk_name, int chunk_size, int getFileVersion(FILE *file) { - int version_major, version_minor, version_patch; + int version_major, version_minor, version_patch, version_release; - version_major = fgetc(file); - version_minor = fgetc(file); - version_patch = fgetc(file); - fgetc(file); /* not used */ + version_major = fgetc(file); + version_minor = fgetc(file); + version_patch = fgetc(file); + version_release = fgetc(file); - return VERSION_IDENT(version_major, version_minor, version_patch); + return RELEASE_IDENT(version_major, version_minor, version_patch, + version_release); } void putFileVersion(FILE *file, int version) { - int version_major = VERSION_MAJOR(version); - int version_minor = VERSION_MINOR(version); - int version_patch = VERSION_PATCH(version); + int version_major = VERSION_MAJOR(version); + int version_minor = VERSION_MINOR(version); + int version_patch = VERSION_PATCH(version); + int version_release = VERSION_RELEASE(version); - fputc(version_major, file); - fputc(version_minor, file); - fputc(version_patch, file); - fputc(0, file); /* not used */ + fputc(version_major, file); + fputc(version_minor, file); + fputc(version_patch, file); + fputc(version_release, file); } void ReadUnusedBytesFromFile(FILE *file, unsigned long bytes) @@ -1777,12 +1782,12 @@ static boolean token_suffix_match(char *token, char *suffix, int start_pos) #define KNOWN_TOKEN_VALUE "[KNOWN_TOKEN]" -static void read_token_parameters(struct SetupFileList *setup_file_list, +static void read_token_parameters(SetupFileHash *setup_file_hash, struct ConfigInfo *suffix_list, struct FileInfo *file_list_entry) { /* check for config token that is the base token without any suffixes */ - char *filename = getTokenValue(setup_file_list, file_list_entry->token); + char *filename = getHashEntry(setup_file_hash, file_list_entry->token); char *known_token_value = KNOWN_TOKEN_VALUE; int i; @@ -1797,23 +1802,31 @@ static void read_token_parameters(struct SetupFileList *setup_file_list, 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); + setHashEntry(setup_file_hash, file_list_entry->token, known_token_value); } +#if 0 else + { + if (strcmp(file_list_entry->filename, + file_list_entry->default_filename) != 0) + printf("___ resetting '%s' to default\n", file_list_entry->token); + setString(&file_list_entry->filename, file_list_entry->default_filename); + } +#endif /* 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); + char *value = getHashEntry(setup_file_hash, token); if (value != NULL) { 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); + setHashEntry(setup_file_hash, token, known_token_value); } free(token); @@ -1822,7 +1835,7 @@ 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, + SetupFileHash *extra_file_hash, struct ConfigInfo *suffix_list, int num_suffix_list_entries, char *token) @@ -1843,7 +1856,7 @@ static void add_dynamic_file_list_entry(struct FileInfo **list, 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); + read_token_parameters(extra_file_hash, suffix_list, new_list_entry); } static void add_property_mapping(struct PropertyMapping **list, @@ -1867,7 +1880,8 @@ static void add_property_mapping(struct PropertyMapping **list, new_list_entry->artwork_index = artwork_index; } -void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) +static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info, + char *filename) { struct FileInfo *file_list = artwork_info->file_list; struct ConfigInfo *suffix_list = artwork_info->suffix_list; @@ -1883,86 +1897,44 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) 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; + SetupFileHash *setup_file_hash, *extra_file_hash; char *known_token_value = KNOWN_TOKEN_VALUE; int i, j, k, l; -#if 0 - printf("GOT CUSTOM ARTWORK CONFIG FILE '%s'\n", filename); -#endif - - /* 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) return; - if ((setup_file_list = loadSetupFileList(filename)) == NULL) +#if 0 + printf("::: LoadArtworkConfigFromFilename: '%s'\n", filename); +#endif + + if ((setup_file_hash = loadSetupFileHash(filename)) == NULL) return; /* read parameters for all known config file tokens */ for (i=0; inext) + extra_file_hash = newSetupFileHash(); + BEGIN_HASH_ITERATION(setup_file_hash, itr) { - 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); - } + if (strcmp(HASH_ITERATION_VALUE(itr), known_token_value) != 0) + setHashEntry(extra_file_hash, + HASH_ITERATION_TOKEN(itr), HASH_ITERATION_VALUE(itr)); } + END_HASH_ITERATION(setup_file_hash, itr) - /* at this point, we do not need the config file list anymore -- free it */ - freeSetupFileList(setup_file_list); + /* at this point, we do not need the config file hash anymore -- free it */ + freeSetupFileHash(setup_file_hash); /* now try to determine valid, dynamically defined config tokens */ - for (list = extra_file_list; list != NULL; list = list->next) + BEGIN_HASH_ITERATION(extra_file_hash, itr) { struct FileInfo **dynamic_file_list = &artwork_info->dynamic_file_list; @@ -1975,7 +1947,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) int current_summarized_file_list_entry = artwork_info->num_file_list_entries + artwork_info->num_dynamic_file_list_entries; - char *token = list->token; + char *token = HASH_ITERATION_TOKEN(itr); int len_token = strlen(token); int start_pos; boolean base_prefix_found = FALSE; @@ -2032,7 +2004,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) add_dynamic_file_list_entry(dynamic_file_list, num_dynamic_file_list_entries, - extra_file_list, + extra_file_hash, suffix_list, num_suffix_list_entries, token); @@ -2069,7 +2041,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) add_dynamic_file_list_entry(dynamic_file_list, num_dynamic_file_list_entries, - extra_file_list, + extra_file_hash, suffix_list, num_suffix_list_entries, token); @@ -2111,7 +2083,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) add_dynamic_file_list_entry(dynamic_file_list, num_dynamic_file_list_entries, - extra_file_list, + extra_file_hash, suffix_list, num_suffix_list_entries, token); @@ -2153,7 +2125,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) add_dynamic_file_list_entry(dynamic_file_list, num_dynamic_file_list_entries, - extra_file_list, + extra_file_hash, suffix_list, num_suffix_list_entries, token); @@ -2166,6 +2138,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) } } } + END_HASH_ITERATION(extra_file_hash, itr) if (artwork_info->num_dynamic_file_list_entries > 0) { @@ -2174,28 +2147,38 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) artwork_info->sizeof_artwork_list_entry); } - if (extra_file_list != NULL && options.verbose && IS_PARENT_PROCESS()) + if (extra_file_hash != NULL && options.verbose && IS_PARENT_PROCESS()) { + SetupFileList *setup_file_list, *list; boolean dynamic_tokens_found = FALSE; boolean unknown_tokens_found = FALSE; - for (list = extra_file_list; list != NULL; list = list->next) + if ((setup_file_list = loadSetupFileList(filename)) == NULL) + Error(ERR_EXIT, "loadSetupFileHash works, but loadSetupFileList fails"); + + BEGIN_HASH_ITERATION(extra_file_hash, itr) { - if (strcmp(list->value, known_token_value) == 0) + if (strcmp(HASH_ITERATION_VALUE(itr), known_token_value) == 0) dynamic_tokens_found = TRUE; else unknown_tokens_found = TRUE; } + END_HASH_ITERATION(extra_file_hash, itr) #if DEBUG if (dynamic_tokens_found) { Error(ERR_RETURN_LINE, "-"); - Error(ERR_RETURN, "dynamic token(s) found:"); + Error(ERR_RETURN, "dynamic 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) + for (list = setup_file_list; list != NULL; list = list->next) + { + char *value = getHashEntry(extra_file_hash, list->token); + + if (value != NULL && strcmp(value, known_token_value) == 0) Error(ERR_RETURN, "- dynamic token: '%s'", list->token); + } Error(ERR_RETURN_LINE, "-"); } @@ -2207,15 +2190,21 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) 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); + for (list = setup_file_list; list != NULL; list = list->next) + { + char *value = getHashEntry(extra_file_hash, list->token); + + if (value != NULL && strcmp(value, known_token_value) != 0) + Error(ERR_RETURN, "- dynamic token: '%s'", list->token); + } Error(ERR_RETURN_LINE, "-"); } + + freeSetupFileList(setup_file_list); } - freeSetupFileList(extra_file_list); + freeSetupFileHash(extra_file_hash); #if 0 for (i=0; ifile_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_base = UNDEFINED_FILENAME, *filename_local; + int i, j; + +#if 0 + printf("GOT CUSTOM ARTWORK CONFIG FILE '%s'\n", filename); +#endif + + /* 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 (!SETUP_OVERRIDE_ARTWORK(setup, artwork_info->type)) + { + /* first look for special artwork configured in level series config */ + filename_base = getCustomArtworkLevelConfigFilename(artwork_info->type); + + if (fileExists(filename_base)) + LoadArtworkConfigFromFilename(artwork_info, filename_base); + } + + filename_local = getCustomArtworkConfigFilename(artwork_info->type); + + if (filename_local != NULL && strcmp(filename_base, filename_local) != 0) + LoadArtworkConfigFromFilename(artwork_info, filename_local); +} + static void deleteArtworkListEntry(struct ArtworkListInfo *artwork_info, struct ListNodeInfo **listnode) { @@ -2259,7 +2312,7 @@ static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, char *basename) { char *init_text[] = - { "", + { "Loading graphics:", "Loading sounds:", "Loading music:" @@ -2272,9 +2325,11 @@ static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, { int error_mode = ERR_WARN; +#if 1 /* we can get away without sounds and music, but not without graphics */ if (*listnode == NULL && artwork_info->type == ARTWORK_TYPE_GRAPHICS) error_mode = ERR_EXIT; +#endif Error(error_mode, "cannot find artwork file '%s'", basename); return; @@ -2310,6 +2365,10 @@ static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, return; } +#if 0 + printf("::: %s: '%s'\n", init_text[artwork_info->type], basename); +#endif + DrawInitText(init_text[artwork_info->type], 120, FC_GREEN); DrawInitText(basename, 150, FC_YELLOW); @@ -2327,9 +2386,11 @@ static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, { int error_mode = ERR_WARN; +#if 1 /* we can get away without sounds and music, but not without graphics */ if (artwork_info->type == ARTWORK_TYPE_GRAPHICS) error_mode = ERR_EXIT; +#endif Error(error_mode, "cannot load artwork file '%s'", basename); return; @@ -2396,9 +2457,28 @@ void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info) #endif for(i=0; i '%s'\n", file_list[i].token, file_list[i].filename); +#endif + LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i], file_list[i].filename, i); +#if 0 + if (artwork_info->artwork_list[i] == NULL && + strcmp(file_list[i].default_filename, file_list[i].filename) != 0) + { + Error(ERR_WARN, "trying default artwork file '%s'", + file_list[i].default_filename); + + LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i], + file_list[i].default_filename, i); + } +#endif + } + #if 0 printf("DEBUG: reloading %d dynamic artwork files ...\n", num_dynamic_file_list_entries);