X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=a3c3247978f80b38b24759f5d34bfbf6fc7871c1;hb=f8f691137746b187cca2f997604a2336882b5cd9;hp=aa5cbb1e0d058f8ec6f5d0e45b87d13a352e8b4f;hpb=77acdb46d729cd3f9893d6a91740cb058923d4cf;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index aa5cbb1e..a3c32479 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -337,26 +337,24 @@ static char *get_corrected_real_name(char *real_name) char *from_ptr = real_name; char *to_ptr = real_name_new; - if (strchr(real_name, 'ß') == NULL) /* name does not contain 'ß' */ - { - strncpy(real_name_new, real_name, MAX_USERNAME_LEN); - real_name_new[MAX_USERNAME_LEN] = '\0'; - - return real_name_new; - } - - /* the user's real name may contain a 'ß' character (german sharp s), - which has no equivalent in upper case letters (which our fonts use) */ + /* copy the name string, but not more than MAX_USERNAME_LEN characters */ while (*from_ptr && (long)(to_ptr - real_name_new) < MAX_USERNAME_LEN - 1) { - if (*from_ptr != 'ß') - *to_ptr++ = *from_ptr++; - else + /* the name field read from "passwd" file may also contain additional + user information, separated by commas, which will be removed here */ + if (*from_ptr == ',') + break; + + /* the user's real name may contain 'ß' characters (german sharp s), + which have no equivalent in upper case letters (used by our fonts) */ + if (*from_ptr == 'ß') { from_ptr++; *to_ptr++ = 's'; *to_ptr++ = 's'; } + else + *to_ptr++ = *from_ptr++; } *to_ptr = '\0'; @@ -458,6 +456,51 @@ char *getHomeDir() } +/* ------------------------------------------------------------------------- */ +/* path manipulation functions */ +/* ------------------------------------------------------------------------- */ + +static char *getLastPathSeparatorPtr(char *filename) +{ + char *last_separator = strrchr(filename, '/'); + +#if !defined(PLATFORM_UNIX) + if (last_separator == NULL) /* also try DOS/Windows variant */ + last_separator = strrchr(filename, '\\'); +#endif + + return last_separator; +} + +static char *getBaseNamePtr(char *filename) +{ + char *last_separator = getLastPathSeparatorPtr(filename); + + if (last_separator != NULL) + return last_separator + 1; /* separator found: strip base path */ + else + return filename; /* no separator found: filename has no path */ +} + +char *getBaseName(char *filename) +{ + return getStringCopy(getBaseNamePtr(filename)); +} + +char *getBasePath(char *filename) +{ + char *basepath = getStringCopy(filename); + char *last_separator = getLastPathSeparatorPtr(basepath); + + if (last_separator != NULL) + *last_separator = '\0'; /* separator found: strip basename */ + else + basepath = "."; /* no separator found: use current path */ + + return basepath; +} + + /* ------------------------------------------------------------------------- */ /* various string functions */ /* ------------------------------------------------------------------------- */ @@ -531,19 +574,26 @@ void setString(char **old_value, char *new_value) void GetOptions(char *argv[], void (*print_usage_function)(void)) { + char *ro_base_path = RO_BASE_PATH; + char *rw_base_path = RW_BASE_PATH; char **options_left = &argv[1]; + if (strcmp(ro_base_path, ".") == 0) + ro_base_path = program.command_basepath; + if (strcmp(rw_base_path, ".") == 0) + rw_base_path = program.command_basepath; + /* initialize global program options */ options.display_name = NULL; options.server_host = NULL; options.server_port = 0; - options.ro_base_directory = RO_BASE_PATH; - options.rw_base_directory = RW_BASE_PATH; - options.level_directory = RO_BASE_PATH "/" LEVELS_DIRECTORY; - options.graphics_directory = RO_BASE_PATH "/" GRAPHICS_DIRECTORY; - options.sounds_directory = RO_BASE_PATH "/" SOUNDS_DIRECTORY; - options.music_directory = RO_BASE_PATH "/" MUSIC_DIRECTORY; - options.docs_directory = RO_BASE_PATH "/" DOCS_DIRECTORY; + options.ro_base_directory = ro_base_path; + options.rw_base_directory = rw_base_path; + options.level_directory = getPath2(ro_base_path, LEVELS_DIRECTORY); + options.graphics_directory = getPath2(ro_base_path, GRAPHICS_DIRECTORY); + options.sounds_directory = getPath2(ro_base_path, SOUNDS_DIRECTORY); + options.music_directory = getPath2(ro_base_path, MUSIC_DIRECTORY); + options.docs_directory = getPath2(ro_base_path, DOCS_DIRECTORY); options.execute_command = NULL; options.serveronly = FALSE; options.network = FALSE; @@ -610,22 +660,17 @@ void GetOptions(char *argv[], void (*print_usage_function)(void)) Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str); /* this should be extended to separate options for ro and rw data */ - options.ro_base_directory = option_arg; - options.rw_base_directory = option_arg; + options.ro_base_directory = ro_base_path = option_arg; + options.rw_base_directory = rw_base_path = option_arg; if (option_arg == next_option) options_left++; /* adjust paths for sub-directories in base directory accordingly */ - options.level_directory = - getPath2(options.ro_base_directory, LEVELS_DIRECTORY); - options.graphics_directory = - getPath2(options.ro_base_directory, GRAPHICS_DIRECTORY); - options.sounds_directory = - getPath2(options.ro_base_directory, SOUNDS_DIRECTORY); - options.music_directory = - getPath2(options.ro_base_directory, MUSIC_DIRECTORY); - options.docs_directory = - getPath2(options.ro_base_directory, DOCS_DIRECTORY); + options.level_directory = getPath2(ro_base_path, LEVELS_DIRECTORY); + options.graphics_directory = getPath2(ro_base_path, GRAPHICS_DIRECTORY); + options.sounds_directory = getPath2(ro_base_path, SOUNDS_DIRECTORY); + options.music_directory = getPath2(ro_base_path, MUSIC_DIRECTORY); + options.docs_directory = getPath2(ro_base_path, DOCS_DIRECTORY); } else if (strncmp(option, "-levels", option_len) == 0) { @@ -1560,27 +1605,21 @@ boolean fileHasSuffix(char *basename, char *suffix) boolean FileIsGraphic(char *filename) { - char *basename = strrchr(filename, '/'); - - basename = (basename != NULL ? basename + 1 : filename); + char *basename = getBaseNamePtr(filename); return fileHasSuffix(basename, "pcx"); } boolean FileIsSound(char *filename) { - char *basename = strrchr(filename, '/'); - - basename = (basename != NULL ? basename + 1 : filename); + char *basename = getBaseNamePtr(filename); return fileHasSuffix(basename, "wav"); } boolean FileIsMusic(char *filename) { - char *basename = strrchr(filename, '/'); - - basename = (basename != NULL ? basename + 1 : filename); + char *basename = getBaseNamePtr(filename); if (FileIsSound(basename)) return TRUE; @@ -1615,6 +1654,27 @@ boolean FileIsArtworkType(char *basename, int type) /* functions for loading artwork configuration information */ /* ------------------------------------------------------------------------- */ +char *get_mapped_token(char *token) +{ + /* !!! make this dynamically configurable (init.c:InitArtworkConfig) !!! */ + static char *map_token_prefix[][2] = + { + { "char_procent", "char_percent" }, + { NULL, } + }; + int i; + + for (i = 0; map_token_prefix[i][0] != NULL; i++) + { + int len_token_prefix = strlen(map_token_prefix[i][0]); + + if (strncmp(token, map_token_prefix[i][0], len_token_prefix) == 0) + return getStringCat2(map_token_prefix[i][1], &token[len_token_prefix]); + } + + return NULL; +} + /* This function checks if a string of the format "string1, string2, ..." exactly contains a string . */ @@ -1745,6 +1805,9 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, setString(&file_list[i].default_parameter[j], suffix_list[j].value); setString(&file_list[i].parameter[j], suffix_list[j].value); } + + file_list[i].redefined = FALSE; + file_list[i].fallback_to_default = FALSE; } } @@ -1919,6 +1982,9 @@ static void add_dynamic_file_list_entry(struct FileInfo **list, new_list_entry->filename = NULL; new_list_entry->parameter = checked_calloc(parameter_array_size); + new_list_entry->redefined = FALSE; + new_list_entry->fallback_to_default = FALSE; + read_token_parameters(extra_file_hash, suffix_list, new_list_entry); } @@ -1990,6 +2056,29 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info, /* at this point, we do not need the setup file hash anymore -- free it */ freeSetupFileHash(setup_file_hash); +#if 1 + /* map deprecated to current tokens (using prefix match and replace) */ + BEGIN_HASH_ITERATION(valid_file_hash, itr) + { + char *token = HASH_ITERATION_TOKEN(itr); + char *mapped_token = get_mapped_token(token); + + if (mapped_token != NULL) + { + char *value = HASH_ITERATION_VALUE(itr); + + /* add mapped token */ + setHashEntry(valid_file_hash, mapped_token, value); + + /* ignore old token (by setting it to "known" keyword) */ + setHashEntry(valid_file_hash, token, known_token_value); + + free(mapped_token); + } + } + END_HASH_ITERATION(valid_file_hash, itr) +#endif + /* read parameters for all known config file tokens */ for (i = 0; i < num_file_list_entries; i++) read_token_parameters(valid_file_hash, suffix_list, &file_list[i]); @@ -2339,6 +2428,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) setString(&file_list[i].parameter[j], file_list[i].default_parameter[j]); file_list[i].redefined = FALSE; + file_list[i].fallback_to_default = FALSE; } /* free previous dynamic artwork file array */ @@ -2407,6 +2497,127 @@ static void deleteArtworkListEntry(struct ArtworkListInfo *artwork_info, } } +#if 1 +static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, + struct ListNodeInfo **listnode, + struct FileInfo *file_list_entry) +{ + char *init_text[] = + { + "Loading graphics:", + "Loading sounds:", + "Loading music:" + }; + + ListNode *node; + char *basename = file_list_entry->filename; + char *filename = getCustomArtworkFilename(basename, artwork_info->type); + +#if 0 + if (strcmp(file_list_entry->token, "background.DOOR") == 0) + printf("::: replaceArtworkListEntry: '%s' => '%s'\n", + basename, filename); +#endif + + if (filename == NULL) + { + Error(ERR_WARN, "cannot find artwork file '%s'", basename); + + basename = file_list_entry->default_filename; + + /* dynamic artwork has no default filename / skip empty default artwork */ + if (basename == NULL || strcmp(basename, UNDEFINED_FILENAME) == 0) + return; + + file_list_entry->fallback_to_default = TRUE; + + Error(ERR_WARN, "trying default artwork file '%s'", basename); + + filename = getCustomArtworkFilename(basename, artwork_info->type); + + if (filename == NULL) + { + int error_mode = ERR_WARN; + + /* 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; + + Error(error_mode, "cannot find default artwork file '%s'", basename); + + return; + } + } + + /* check if the old and the new artwork file are the same */ + if (*listnode && strcmp((*listnode)->source_filename, filename) == 0) + { + /* The old and new artwork are the same (have the same filename and path). + This usually means that this artwork does not exist in this artwork set + and a fallback to the existing artwork is done. */ + +#if 0 + printf("[artwork '%s' already exists (same list entry)]\n", filename); +#endif + + return; + } + + /* delete existing artwork file entry */ + deleteArtworkListEntry(artwork_info, listnode); + + /* check if the new artwork file already exists in the list of artworks */ + if ((node = getNodeFromKey(artwork_info->content_list, filename)) != NULL) + { +#if 0 + printf("[artwork '%s' already exists (other list entry)]\n", filename); +#endif + + *listnode = (struct ListNodeInfo *)node->content; + (*listnode)->num_references++; + + return; + } + +#if 0 + if (strcmp(file_list_entry->token, "background.DOOR") == 0) + printf("::: replaceArtworkListEntry: LOAD IT'\n"); +#endif + +#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); + + if ((*listnode = artwork_info->load_artwork(filename)) != NULL) + { +#if 0 + printf("[adding new artwork '%s']\n", filename); +#endif + + (*listnode)->num_references = 1; + addNodeToList(&artwork_info->content_list, (*listnode)->source_filename, + *listnode); + } + else + { + 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; + } +} + +#else + static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, struct ListNodeInfo **listnode, char *basename) @@ -2426,6 +2637,9 @@ static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, int error_mode = ERR_WARN; #if 1 + /* !!! NEW ARTWORK FALLBACK CODE !!! NEARLY UNTESTED !!! */ + /* before failing, try fallback to default artwork */ +#else /* 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; @@ -2496,6 +2710,33 @@ static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, return; } } +#endif + +#if 1 +static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info, + struct ListNodeInfo **listnode, + struct FileInfo *file_list_entry) +{ +#if 0 + printf("GOT CUSTOM ARTWORK FILE '%s'\n", filename); +#endif + +#if 0 + if (strcmp(file_list_entry->token, "background.DOOR") == 0) + printf("::: -> '%s' -> '%s'\n", + file_list_entry->token, file_list_entry->filename); +#endif + + if (strcmp(file_list_entry->filename, UNDEFINED_FILENAME) == 0) + { + deleteArtworkListEntry(artwork_info, listnode); + return; + } + + replaceArtworkListEntry(artwork_info, listnode, file_list_entry); +} + +#else static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info, struct ListNodeInfo **listnode, @@ -2513,6 +2754,38 @@ static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info, replaceArtworkListEntry(artwork_info, listnode, basename); } +#endif + +#if 1 +static void LoadArtworkToList(struct ArtworkListInfo *artwork_info, + struct ListNodeInfo **listnode, + struct FileInfo *file_list_entry) +{ +#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", + file_list_entry->filename, getNumNodes(artwork_info->content_list)); +#endif + +#if 1 + LoadCustomArtwork(artwork_info, listnode, file_list_entry); +#else + LoadCustomArtwork(artwork_info, &artwork_info->artwork_list[list_pos], + basename); +#endif + +#if 0 + printf("loading artwork '%s' done [%d]\n", + basename, getNumNodes(artwork_info->content_list)); +#endif +} + +#else static void LoadArtworkToList(struct ArtworkListInfo *artwork_info, struct ListNodeInfo **listnode, @@ -2541,6 +2814,7 @@ static void LoadArtworkToList(struct ArtworkListInfo *artwork_info, basename, getNumNodes(artwork_info->content_list)); #endif } +#endif void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info) { @@ -2559,22 +2833,51 @@ void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info) for (i = 0; i < num_file_list_entries; i++) { #if 0 - if (strcmp(file_list[i].token, "background") == 0) + if (strcmp(file_list[i].token, "background.DOOR") == 0) printf("::: '%s' -> '%s'\n", file_list[i].token, file_list[i].filename); #endif +#if 1 + LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i], + &file_list[i]); +#else LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i], file_list[i].filename, i); +#endif #if 0 + if (strcmp(file_list[i].token, "background.DOOR") == 0) + { + Bitmap *bitmap = getBitmapFromImageID(i); + + printf("::: BITMAP: %08lx\n", bitmap); + +#if 0 + BlitBitmap(bitmap, window, 0, 0, 100, 280, 0, 0); +#endif + } +#endif + +#if 0 + /* !!! NEW ARTWORK FALLBACK CODE !!! NEARLY UNTESTED !!! */ if (artwork_info->artwork_list[i] == NULL && - strcmp(file_list[i].default_filename, file_list[i].filename) != 0) + strcmp(file_list[i].filename, UNDEFINED_FILENAME) != 0 && + strcmp(file_list[i].default_filename, file_list[i].filename) != 0 && + strcmp(file_list[i].default_filename, UNDEFINED_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); + + /* even the fallback to default artwork was not successful -- fail now */ + if (artwork_info->artwork_list[i] == NULL && + artwork_info->type == ARTWORK_TYPE_GRAPHICS) + Error(ERR_EXIT, "cannot find artwork file '%s' or default file '%s'", + file_list[i].filename, file_list[i].default_filename); + + file_list[i].fallback_to_default = TRUE; } #endif } @@ -2586,14 +2889,21 @@ void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info) for (i = 0; i < num_dynamic_file_list_entries; i++) { +#if 1 + LoadArtworkToList(artwork_info, &artwork_info->dynamic_artwork_list[i], + &dynamic_file_list[i]); +#else LoadArtworkToList(artwork_info, &artwork_info->dynamic_artwork_list[i], dynamic_file_list[i].filename, i); +#endif #if 0 printf("::: '%s', '0x%08x'\n", dynamic_file_list[i].filename, dynamic_file_list[i].default_filename); #endif + + /* dynamic artwork does not have default filename! */ } #if 0