X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=b9f9a3ae82b23eb72d8ec1069d69951cb1635cc3;hp=921ffdadb079440c1afadfb047efa26727c4b502;hb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181;hpb=297ee9b33dab3bca9433befc81d7c7ce91450dd0 diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 921ffdad..b9f9a3ae 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1994-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* setup.c * -***********************************************************/ +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// setup.c +// ============================================================================ #include #include @@ -32,6 +30,8 @@ #include "hash.h" +#define ENABLE_UNUSED_CODE 0 /* currently unused functions */ + #define NUM_LEVELCLASS_DESC 8 static char *levelclass_desc[NUM_LEVELCLASS_DESC] = @@ -357,7 +357,7 @@ char *setLevelArtworkDir(TreeInfo *ti) checked_free(*artwork_set_ptr); - if (fileExists(dir)) + if (directoryExists(dir)) { *artwork_path_ptr = getStringCopy(getClassicArtworkDir(ti->type)); *artwork_set_ptr = getStringCopy(getClassicArtworkSet(ti->type)); @@ -598,34 +598,7 @@ char *getLevelSetTitleMessageFilename(int nr, boolean initial) static char *getCorrectedArtworkBasename(char *basename) { - char *basename_corrected = basename; - -#if defined(PLATFORM_MSDOS) - if (program.filename_prefix != NULL) - { - int prefix_len = strlen(program.filename_prefix); - - if (strncmp(basename, program.filename_prefix, prefix_len) == 0) - basename_corrected = &basename[prefix_len]; - - /* if corrected filename is still longer than standard MS-DOS filename - size (8 characters + 1 dot + 3 characters file extension), shorten - filename by writing file extension after 8th basename character */ - if (strlen(basename_corrected) > 8 + 1 + 3) - { - static char *msdos_filename = NULL; - - checked_free(msdos_filename); - - msdos_filename = getStringCopy(basename_corrected); - strncpy(&msdos_filename[8], &basename[strlen(basename) - (1+3)], 1+3 +1); - - basename_corrected = msdos_filename; - } - } -#endif - - return basename_corrected; + return basename; } char *getCustomImageFilename(char *basename) @@ -880,7 +853,7 @@ char *getCustomMusicDirectory(void) { /* 1st try: look for special artwork in current level series directory */ directory = getPath2(getCurrentLevelDir(), MUSIC_DIRECTORY); - if (fileExists(directory)) + if (directoryExists(directory)) return directory; free(directory); @@ -890,7 +863,7 @@ char *getCustomMusicDirectory(void) { /* 2nd try: look for special artwork configured in level series config */ directory = getStringCopy(getLevelArtworkDir(TREE_TYPE_MUSIC_DIR)); - if (fileExists(directory)) + if (directoryExists(directory)) return directory; free(directory); @@ -904,7 +877,7 @@ char *getCustomMusicDirectory(void) { /* 3rd try: look for special artwork in configured artwork directory */ directory = getStringCopy(getSetupArtworkDir(artwork.mus_current)); - if (fileExists(directory)) + if (directoryExists(directory)) return directory; free(directory); @@ -912,14 +885,14 @@ char *getCustomMusicDirectory(void) /* 4th try: look for default artwork in new default artwork directory */ directory = getStringCopy(getDefaultMusicDir(MUS_DEFAULT_SUBDIR)); - if (fileExists(directory)) + if (directoryExists(directory)) return directory; free(directory); /* 5th try: look for default artwork in old default artwork directory */ directory = getStringCopy(options.music_directory); - if (fileExists(directory)) + if (directoryExists(directory)) return directory; return NULL; /* cannot find specified artwork file anywhere */ @@ -943,7 +916,7 @@ static void SaveUserLevelInfo(); void InitUserLevelDirectory(char *level_subdir) { - if (!fileExists(getUserLevelDir(level_subdir))) + if (!directoryExists(getUserLevelDir(level_subdir))) { createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE); createDirectory(getUserLevelDir(NULL), "main user level", PERMS_PRIVATE); @@ -1118,13 +1091,7 @@ TreeInfo *cloneTreeNode(TreeInfo **node_top, TreeInfo *node_parent, return cloneTreeNode(node_top, node_parent, node->next, skip_sets_without_levels); -#if 1 node_new = getTreeInfoCopy(node); /* copy complete node */ -#else - node_new = newTreeInfo(); - - *node_new = *node; /* copy complete node */ -#endif node_new->node_top = node_top; /* correct top node link */ node_new->node_parent = node_parent; /* correct parent node link */ @@ -1375,9 +1342,14 @@ char *getUserGameDataDir(void) { static char *user_game_data_dir = NULL; +#if defined(PLATFORM_ANDROID) + if (user_game_data_dir == NULL) + user_game_data_dir = (char *)SDL_AndroidGetInternalStoragePath(); +#else if (user_game_data_dir == NULL) user_game_data_dir = getPath2(getPersonalDataDir(), program.userdata_subdir); +#endif return user_game_data_dir; } @@ -1389,7 +1361,7 @@ void updateUserGameDataDir() char *userdata_dir_new = getUserGameDataDir(); /* do not free() this */ /* convert old Unix style game data directory to Mac OS X style, if needed */ - if (fileExists(userdata_dir_old) && !fileExists(userdata_dir_new)) + if (directoryExists(userdata_dir_old) && !directoryExists(userdata_dir_new)) { if (rename(userdata_dir_old, userdata_dir_new) != 0) { @@ -1456,7 +1428,7 @@ void createDirectory(char *dir, char *text, int permission_class) else dir_mode |= MODE_W_ALL; - if (!fileExists(dir)) + if (!directoryExists(dir)) if (posix_mkdir(dir, dir_mode) != 0) Error(ERR_WARN, "cannot create %s directory '%s': %s", text, dir, strerror(errno)); @@ -1637,7 +1609,7 @@ SetupFileList *addListEntry(SetupFileList *list, char *token, char *value) return addListEntry(list->next, token, value); } -#if 0 +#if ENABLE_UNUSED_CODE #ifdef DEBUG static void printSetupFileList(SetupFileList *list) { @@ -1749,7 +1721,8 @@ char *removeHashEntry(SetupFileHash *hash, char *token) return remove_hash_entry(hash, token); } -#if 0 +#if ENABLE_UNUSED_CODE +#if DEBUG static void printSetupFileHash(SetupFileHash *hash) { BEGIN_HASH_ITERATION(hash, itr) @@ -1760,6 +1733,7 @@ static void printSetupFileHash(SetupFileHash *hash) END_HASH_ITERATION(hash, itr) } #endif +#endif #define ALLOW_TOKEN_VALUE_SEPARATOR_BEING_WHITESPACE 1 #define CHECK_TOKEN_VALUE_SEPARATOR__WARN_IF_MISSING 0 @@ -1825,12 +1799,8 @@ static boolean getTokenValueFromSetupLineExt(char *line, /* find end of token to determine start of value */ for (line_ptr = token; *line_ptr; line_ptr++) { -#if 1 /* first look for an explicit token/value separator, like ':' or '=' */ if (*line_ptr == ':' || *line_ptr == '=') -#else - if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':') -#endif { *line_ptr = '\0'; /* terminate token string */ value = line_ptr + 1; /* set beginning of value */ @@ -1897,11 +1867,6 @@ static boolean getTokenValueFromSetupLineExt(char *line, if (*value != ' ' && *value != '\t') break; -#if 0 - if (*value == '\0') - value = "true"; /* treat tokens without value as "true" */ -#endif - *token_ptr = token; *value_ptr = value; @@ -1917,7 +1882,6 @@ boolean getTokenValueFromSetupLine(char *line, char **token, char **value) return getTokenValueFromSetupLineExt(line, token, value, NULL, NULL, 0, TRUE); } -#if 1 static boolean loadSetupFileData(void *setup_file_data, char *filename, boolean top_recursion_level, boolean is_hash) { @@ -1926,7 +1890,7 @@ static boolean loadSetupFileData(void *setup_file_data, char *filename, char *token, *value, *line_ptr; void *insert_ptr = NULL; boolean read_continued_line = FALSE; - FILE *file; + File *file; int line_nr = 0, token_count = 0, include_count = 0; #if CHECK_TOKEN_VALUE_SEPARATOR__WARN_IF_MISSING @@ -1937,7 +1901,7 @@ static boolean loadSetupFileData(void *setup_file_data, char *filename, token_already_exists_warning = FALSE; #endif - if (!(file = fopen(filename, MODE_READ))) + if (!(file = openFile(filename, MODE_READ))) { Error(ERR_WARN, "cannot open configuration file '%s'", filename); @@ -1955,10 +1919,10 @@ static boolean loadSetupFileData(void *setup_file_data, char *filename, /* mark this file as already included (to prevent including it again) */ setHashEntry(include_filename_hash, getBaseNamePtr(filename), "true"); - while (!feof(file)) + while (!checkEndOfFile(file)) { /* read next line of input file */ - if (!fgets(line, MAX_LINE_LEN, file)) + if (!getStringFromFile(file, line, MAX_LINE_LEN)) break; /* check if line was completely read and is terminated by line break */ @@ -1975,14 +1939,6 @@ static boolean loadSetupFileData(void *setup_file_data, char *filename, if (read_continued_line) { -#if 0 - /* !!! ??? WHY ??? !!! */ - /* cut leading whitespaces from input line */ - for (line_ptr = line; *line_ptr; line_ptr++) - if (*line_ptr != ' ' && *line_ptr != '\t') - break; -#endif - /* append new line to existing line, if there is enough space */ if (strlen(previous_line) + strlen(line_ptr) < MAX_LINE_LEN) strcat(previous_line, line_ptr); @@ -2017,10 +1973,6 @@ static boolean loadSetupFileData(void *setup_file_data, char *filename, char *basename = getBaseName(value); char *filename_include = getPath2(basepath, basename); -#if 0 - Error(ERR_INFO, "[including file '%s']", filename_include); -#endif - loadSetupFileData(setup_file_data, filename_include, FALSE, is_hash); free(basepath); @@ -2071,7 +2023,7 @@ static boolean loadSetupFileData(void *setup_file_data, char *filename, } } - fclose(file); + closeFile(file); #if CHECK_TOKEN_VALUE_SEPARATOR__WARN_IF_MISSING if (token_value_separator_warning) @@ -2092,239 +2044,6 @@ static boolean loadSetupFileData(void *setup_file_data, char *filename, return TRUE; } -#else - -static boolean loadSetupFileData(void *setup_file_data, char *filename, - boolean top_recursion_level, boolean is_hash) -{ - static SetupFileHash *include_filename_hash = NULL; - char line[MAX_LINE_LEN], line_raw[MAX_LINE_LEN], previous_line[MAX_LINE_LEN]; - char *token, *value, *line_ptr; - void *insert_ptr = NULL; - boolean read_continued_line = FALSE; - FILE *file; - int line_nr = 0; - int token_count = 0; - -#if CHECK_TOKEN_VALUE_SEPARATOR__WARN_IF_MISSING - token_value_separator_warning = FALSE; -#endif - - if (!(file = fopen(filename, MODE_READ))) - { - Error(ERR_WARN, "cannot open configuration file '%s'", filename); - - return FALSE; - } - - /* use "insert pointer" to store list end for constant insertion complexity */ - if (!is_hash) - insert_ptr = setup_file_data; - - /* on top invocation, create hash to mark included files (to prevent loops) */ - if (top_recursion_level) - include_filename_hash = newSetupFileHash(); - - /* mark this file as already included (to prevent including it again) */ - setHashEntry(include_filename_hash, getBaseNamePtr(filename), "true"); - - while (!feof(file)) - { - /* read next line of input file */ - if (!fgets(line, MAX_LINE_LEN, file)) - break; - - /* check if line was completely read and is terminated by line break */ - if (strlen(line) > 0 && line[strlen(line) - 1] == '\n') - line_nr++; - - /* cut trailing line break (this can be newline and/or carriage return) */ - for (line_ptr = &line[strlen(line)]; line_ptr >= line; line_ptr--) - if ((*line_ptr == '\n' || *line_ptr == '\r') && *(line_ptr + 1) == '\0') - *line_ptr = '\0'; - - /* copy raw input line for later use (mainly debugging output) */ - strcpy(line_raw, line); - - if (read_continued_line) - { - /* cut leading whitespaces from input line */ - for (line_ptr = line; *line_ptr; line_ptr++) - if (*line_ptr != ' ' && *line_ptr != '\t') - break; - - /* append new line to existing line, if there is enough space */ - if (strlen(previous_line) + strlen(line_ptr) < MAX_LINE_LEN) - strcat(previous_line, line_ptr); - - strcpy(line, previous_line); /* copy storage buffer to line */ - - read_continued_line = FALSE; - } - - /* if the last character is '\', continue at next line */ - if (strlen(line) > 0 && line[strlen(line) - 1] == '\\') - { - line[strlen(line) - 1] = '\0'; /* cut off trailing backslash */ - strcpy(previous_line, line); /* copy line to storage buffer */ - - read_continued_line = TRUE; - - continue; - } - - /* cut trailing comment from input line */ - for (line_ptr = line; *line_ptr; line_ptr++) - { - if (*line_ptr == '#') - { - *line_ptr = '\0'; - break; - } - } - - /* cut trailing whitespaces from input line */ - for (line_ptr = &line[strlen(line)]; line_ptr >= line; line_ptr--) - if ((*line_ptr == ' ' || *line_ptr == '\t') && *(line_ptr + 1) == '\0') - *line_ptr = '\0'; - - /* ignore empty lines */ - if (*line == '\0') - continue; - - /* cut leading whitespaces from token */ - for (token = line; *token; token++) - if (*token != ' ' && *token != '\t') - break; - - /* start with empty value as reliable default */ - value = ""; - - token_value_separator_found = FALSE; - - /* find end of token to determine start of value */ - for (line_ptr = token; *line_ptr; line_ptr++) - { -#if 1 - /* first look for an explicit token/value separator, like ':' or '=' */ - if (*line_ptr == ':' || *line_ptr == '=') -#else - if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':') -#endif - { - *line_ptr = '\0'; /* terminate token string */ - value = line_ptr + 1; /* set beginning of value */ - - token_value_separator_found = TRUE; - - break; - } - } - -#if ALLOW_TOKEN_VALUE_SEPARATOR_BEING_WHITESPACE - /* fallback: if no token/value separator found, also allow whitespaces */ - if (!token_value_separator_found) - { - for (line_ptr = token; *line_ptr; line_ptr++) - { - if (*line_ptr == ' ' || *line_ptr == '\t') - { - *line_ptr = '\0'; /* terminate token string */ - value = line_ptr + 1; /* set beginning of value */ - - token_value_separator_found = TRUE; - - break; - } - } - -#if CHECK_TOKEN_VALUE_SEPARATOR__WARN_IF_MISSING - if (token_value_separator_found) - { - if (!token_value_separator_warning) - { - Error(ERR_INFO_LINE, "-"); - Error(ERR_WARN, "missing token/value separator(s) in config file:"); - Error(ERR_INFO, "- config file: '%s'", filename); - - token_value_separator_warning = TRUE; - } - - Error(ERR_INFO, "- line %d: '%s'", line_nr, line_raw); - } -#endif - } -#endif - - /* cut trailing whitespaces from token */ - for (line_ptr = &token[strlen(token)]; line_ptr >= token; line_ptr--) - if ((*line_ptr == ' ' || *line_ptr == '\t') && *(line_ptr + 1) == '\0') - *line_ptr = '\0'; - - /* cut leading whitespaces from value */ - for (; *value; value++) - if (*value != ' ' && *value != '\t') - break; - -#if 0 - if (*value == '\0') - value = "true"; /* treat tokens without value as "true" */ -#endif - - if (*token) - { - if (strEqual(token, "include")) - { - if (getHashEntry(include_filename_hash, value) == NULL) - { - char *basepath = getBasePath(filename); - char *basename = getBaseName(value); - char *filename_include = getPath2(basepath, basename); - -#if 0 - Error(ERR_INFO, "[including file '%s']", filename_include); -#endif - - loadSetupFileData(setup_file_data, filename_include, FALSE, is_hash); - - free(basepath); - free(basename); - free(filename_include); - } - else - { - Error(ERR_WARN, "ignoring already processed file '%s'", value); - } - } - else - { - if (is_hash) - setHashEntry((SetupFileHash *)setup_file_data, token, value); - else - insert_ptr = addListEntry((SetupFileList *)insert_ptr, token, value); - - token_count++; - } - } - } - - fclose(file); - -#if CHECK_TOKEN_VALUE_SEPARATOR__WARN_IF_MISSING - if (token_value_separator_warning) - Error(ERR_INFO_LINE, "-"); -#endif - - if (token_count == 0) - Error(ERR_WARN, "configuration file '%s' is empty", filename); - - if (top_recursion_level) - freeSetupFileHash(include_filename_hash); - - return TRUE; -} -#endif - void saveSetupFileHash(SetupFileHash *hash, char *filename) { FILE *file; @@ -2612,11 +2331,7 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ti, TreeInfo *parent) ti->last_level = 0; ti->level_group = FALSE; ti->handicap_level = 0; -#if 1 ti->readonly = parent->readonly; -#else - ti->readonly = TRUE; -#endif ti->handicap = TRUE; ti->skip_levels = FALSE; } @@ -2729,6 +2444,14 @@ void freeTreeInfo(TreeInfo *ti) checked_free(ti->special_flags); } + // recursively free child node + if (ti->node_group) + freeTreeInfo(ti->node_group); + + // recursively free next node + if (ti->next) + freeTreeInfo(ti->next); + checked_free(ti); } @@ -2906,16 +2629,7 @@ static char *getCacheToken(char *prefix, char *suffix) static char *getFileTimestampString(char *filename) { -#if 1 return getStringCopy(i_to_a(getFileTimestampEpochSeconds(filename))); -#else - struct stat file_status; - - if (stat(filename, &file_status) != 0) /* cannot stat file */ - return getStringCopy(i_to_a(0)); - - return getStringCopy(i_to_a(file_status.st_mtime)); -#endif } static boolean modifiedFileTimestamp(char *filename, char *timestamp_string) @@ -2963,9 +2677,7 @@ static TreeInfo *getArtworkInfoCacheEntry(LevelDirTree *level_node, int type) /* check if cache entry for this item is invalid or incomplete */ if (value == NULL) { -#if 1 Error(ERR_WARN, "cache entry '%s' invalid", token); -#endif cached = FALSE; } @@ -2995,11 +2707,6 @@ static TreeInfo *getArtworkInfoCacheEntry(LevelDirTree *level_node, int type) if (modifiedFileTimestamp(filename_artworkinfo, cache_entry)) cached = FALSE; -#if 0 - if (!cached) - printf("::: '%s': INVALIDATED FROM CACHE BY TIMESTAMP\n", identifier); -#endif - checked_free(filename_levelinfo); checked_free(filename_artworkinfo); } @@ -3071,10 +2778,6 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, char *level_directory, char *directory_name) { -#if 0 - static unsigned int progress_delay = 0; - unsigned int progress_delay_value = 100; /* (in milliseconds) */ -#endif char *directory_path = getPath2(level_directory, directory_name); char *filename = getPath2(directory_path, LEVELINFO_FILENAME); SetupFileHash *setup_file_hash; @@ -3141,23 +2844,12 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, leveldir_new->fullpath = getPath2(node_parent->fullpath, directory_name); } -#if 0 - if (leveldir_new->levels < 1) - leveldir_new->levels = 1; -#endif - leveldir_new->last_level = leveldir_new->first_level + leveldir_new->levels - 1; leveldir_new->in_user_dir = (!strEqual(leveldir_new->basepath, options.level_directory)); -#if 0 - printf("::: '%s' -> %d\n", - leveldir_new->identifier, - leveldir_new->in_user_dir); -#endif - /* adjust some settings if user's private level directory was detected */ if (leveldir_new->sort_priority == LEVELCLASS_UNDEFINED && leveldir_new->in_user_dir && @@ -3180,34 +2872,8 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, (leveldir_new->user_defined || !leveldir_new->handicap ? leveldir_new->last_level : leveldir_new->first_level); -#if 1 -#if 1 DrawInitTextExt(leveldir_new->name, 150, FC_YELLOW, leveldir_new->level_group); -#else - if (leveldir_new->level_group || - DelayReached(&progress_delay, progress_delay_value)) - DrawInitText(leveldir_new->name, 150, FC_YELLOW); -#endif -#else - DrawInitText(leveldir_new->name, 150, FC_YELLOW); -#endif - -#if 0 - /* !!! don't skip sets without levels (else artwork base sets are missing) */ -#if 1 - if (leveldir_new->levels < 1 && !leveldir_new->level_group) - { - /* skip level sets without levels (which are probably artwork base sets) */ - - freeSetupFileHash(setup_file_hash); - free(directory_path); - free(filename); - - return FALSE; - } -#endif -#endif pushTreeInfo(node_first, leveldir_new); @@ -3233,25 +2899,20 @@ static void LoadLevelInfoFromLevelDir(TreeInfo **node_first, TreeInfo *node_parent, char *level_directory) { - DIR *dir; - struct dirent *dir_entry; + Directory *dir; + DirectoryEntry *dir_entry; boolean valid_entry_found = FALSE; -#if 1 - Error(ERR_INFO, "looking for levels in '%s' ...", level_directory); -#endif - - if ((dir = opendir(level_directory)) == NULL) + if ((dir = openDirectory(level_directory)) == NULL) { Error(ERR_WARN, "cannot read level directory '%s'", level_directory); return; } - while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ + while ((dir_entry = readDirectory(dir)) != NULL) /* loop all entries */ { - struct stat file_status; - char *directory_name = dir_entry->d_name; + char *directory_name = dir_entry->basename; char *directory_path = getPath2(level_directory, directory_name); /* skip entries for current and parent directory */ @@ -3259,14 +2920,15 @@ static void LoadLevelInfoFromLevelDir(TreeInfo **node_first, strEqual(directory_name, "..")) { free(directory_path); + continue; } /* find out if directory entry is itself a directory */ - if (stat(directory_path, &file_status) != 0 || /* cannot stat file */ - (file_status.st_mode & S_IFMT) != S_IFDIR) /* not a directory */ + if (!dir_entry->is_directory) /* not a directory */ { free(directory_path); + continue; } @@ -3282,7 +2944,7 @@ static void LoadLevelInfoFromLevelDir(TreeInfo **node_first, directory_name); } - closedir(dir); + closeDirectory(dir); /* special case: top level directory may directly contain "levelinfo.conf" */ if (node_parent == NULL && !valid_entry_found) @@ -3333,7 +2995,7 @@ void LoadLevelInfo() sortTreeInfo(&leveldir_first); -#if 0 +#if ENABLE_UNUSED_CODE dumpTreeInfo(leveldir_first, 0); #endif } @@ -3354,24 +3016,25 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, if (setup_file_hash == NULL) /* no config file -- look for artwork files */ { - DIR *dir; - struct dirent *dir_entry; + Directory *dir; + DirectoryEntry *dir_entry; boolean valid_file_found = FALSE; - if ((dir = opendir(directory_path)) != NULL) + if ((dir = openDirectory(directory_path)) != NULL) { - while ((dir_entry = readdir(dir)) != NULL) + while ((dir_entry = readDirectory(dir)) != NULL) { - char *entry_name = dir_entry->d_name; + char *entry_name = dir_entry->basename; if (FileIsArtworkType(entry_name, type)) { valid_file_found = TRUE; + break; } } - closedir(dir); + closeDirectory(dir); } if (!valid_file_found) @@ -3397,10 +3060,6 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, if (setup_file_hash) /* (before defining ".color" and ".class_desc") */ { -#if 0 - checkSetupFileHashIdentifier(setup_file_hash, filename, getCookie("...")); -#endif - /* set all structure fields according to the token/value pairs */ ldi = *artwork_new; for (i = 0; i < NUM_LEVELINFO_TOKENS; i++) @@ -3467,10 +3126,6 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, setString(&artwork_new->name_sorting, artwork_new->name); } -#if 0 - DrawInitText(artwork_new->name, 150, FC_YELLOW); -#endif - pushTreeInfo(node_first, artwork_new); freeSetupFileHash(setup_file_hash); @@ -3485,11 +3140,11 @@ static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first, TreeInfo *node_parent, char *base_directory, int type) { - DIR *dir; - struct dirent *dir_entry; + Directory *dir; + DirectoryEntry *dir_entry; boolean valid_entry_found = FALSE; - if ((dir = opendir(base_directory)) == NULL) + if ((dir = openDirectory(base_directory)) == NULL) { /* display error if directory is main "options.graphics_directory" etc. */ if (base_directory == OPTIONS_ARTWORK_DIRECTORY(type)) @@ -3498,10 +3153,9 @@ static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first, return; } - while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ + while ((dir_entry = readDirectory(dir)) != NULL) /* loop all entries */ { - struct stat file_status; - char *directory_name = dir_entry->d_name; + char *directory_name = dir_entry->basename; char *directory_path = getPath2(base_directory, directory_name); /* skip directory entries for current and parent directory */ @@ -3509,14 +3163,15 @@ static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first, strEqual(directory_name, "..")) { free(directory_path); + continue; } - /* skip directory entries which are not a directory or are not accessible */ - if (stat(directory_path, &file_status) != 0 || /* cannot stat file */ - (file_status.st_mode & S_IFMT) != S_IFDIR) /* not a directory */ + /* skip directory entries which are not a directory */ + if (!dir_entry->is_directory) /* not a directory */ { free(directory_path); + continue; } @@ -3528,7 +3183,7 @@ static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first, directory_name, type); } - closedir(dir); + closeDirectory(dir); /* check if this directory directly contains artwork itself */ valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first, node_parent, @@ -3620,7 +3275,7 @@ void LoadArtworkInfo() artwork.snd_current_identifier = artwork.snd_current->identifier; artwork.mus_current_identifier = artwork.mus_current->identifier; -#if 0 +#if ENABLE_UNUSED_CODE printf("graphics set == %s\n\n", artwork.gfx_current_identifier); printf("sounds set == %s\n\n", artwork.snd_current_identifier); printf("music set == %s\n\n", artwork.mus_current_identifier); @@ -3630,7 +3285,7 @@ void LoadArtworkInfo() sortTreeInfo(&artwork.snd_first); sortTreeInfo(&artwork.mus_first); -#if 0 +#if ENABLE_UNUSED_CODE dumpTreeInfo(artwork.gfx_first, 0); dumpTreeInfo(artwork.snd_first, 0); dumpTreeInfo(artwork.mus_first, 0); @@ -3640,10 +3295,6 @@ void LoadArtworkInfo() void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node, LevelDirTree *level_node) { -#if 0 - static unsigned int progress_delay = 0; - unsigned int progress_delay_value = 100; /* (in milliseconds) */ -#endif int type = (*artwork_node)->type; /* recursively check all level directories for artwork sub-directories */ @@ -3688,14 +3339,8 @@ void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node, setArtworkInfoCacheEntry(artwork_new, level_node, type); } -#if 1 DrawInitTextExt(level_node->name, 150, FC_YELLOW, level_node->level_group); -#else - if (level_node->level_group || - DelayReached(&progress_delay, progress_delay_value)) - DrawInitText(level_node->name, 150, FC_YELLOW); -#endif if (level_node->node_group != NULL) LoadArtworkInfoFromLevelInfo(artwork_node, level_node->node_group); @@ -3706,14 +3351,23 @@ void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node, void LoadLevelArtworkInfo() { + print_timestamp_init("LoadLevelArtworkInfo"); + DrawInitText("Looking for custom level artwork", 120, FC_GREEN); + print_timestamp_time("DrawTimeText"); + LoadArtworkInfoFromLevelInfo(&artwork.gfx_first, leveldir_first_all); + print_timestamp_time("LoadArtworkInfoFromLevelInfo (gfx)"); LoadArtworkInfoFromLevelInfo(&artwork.snd_first, leveldir_first_all); + print_timestamp_time("LoadArtworkInfoFromLevelInfo (snd)"); LoadArtworkInfoFromLevelInfo(&artwork.mus_first, leveldir_first_all); + print_timestamp_time("LoadArtworkInfoFromLevelInfo (mus)"); SaveArtworkInfoCache(); + print_timestamp_time("SaveArtworkInfoCache"); + /* needed for reloading level artwork not known at ealier stage */ if (!strEqual(artwork.gfx_current_identifier, setup.graphics_set)) @@ -3749,15 +3403,21 @@ void LoadLevelArtworkInfo() artwork.mus_current = getFirstValidTreeInfoEntry(artwork.mus_first); } + print_timestamp_time("getTreeInfoFromIdentifier"); + sortTreeInfo(&artwork.gfx_first); sortTreeInfo(&artwork.snd_first); sortTreeInfo(&artwork.mus_first); -#if 0 + print_timestamp_time("sortTreeInfo"); + +#if ENABLE_UNUSED_CODE dumpTreeInfo(artwork.gfx_first, 0); dumpTreeInfo(artwork.snd_first, 0); dumpTreeInfo(artwork.mus_first, 0); #endif + + print_timestamp_done("LoadLevelArtworkInfo"); } static void SaveUserLevelInfo() @@ -4012,10 +3672,7 @@ void SaveLevelSetup_LastSeries_Deactivate() static void checkSeriesInfo() { static char *level_directory = NULL; - DIR *dir; -#if 0 - struct dirent *dir_entry; -#endif + Directory *dir; /* check for more levels besides the 'levels' field of 'levelinfo.conf' */ @@ -4024,43 +3681,14 @@ static void checkSeriesInfo() options.level_directory), leveldir_current->fullpath); - if ((dir = opendir(level_directory)) == NULL) + if ((dir = openDirectory(level_directory)) == NULL) { Error(ERR_WARN, "cannot read level directory '%s'", level_directory); return; } -#if 0 - while ((dir_entry = readdir(dir)) != NULL) /* last directory entry */ - { - if (strlen(dir_entry->d_name) > 4 && - dir_entry->d_name[3] == '.' && - strEqual(&dir_entry->d_name[4], LEVELFILE_EXTENSION)) - { - char levelnum_str[4]; - int levelnum_value; - - strncpy(levelnum_str, dir_entry->d_name, 3); - levelnum_str[3] = '\0'; - - levelnum_value = atoi(levelnum_str); - - if (levelnum_value < leveldir_current->first_level) - { - Error(ERR_WARN, "additional level %d found", levelnum_value); - leveldir_current->first_level = levelnum_value; - } - else if (levelnum_value > leveldir_current->last_level) - { - Error(ERR_WARN, "additional level %d found", levelnum_value); - leveldir_current->last_level = levelnum_value; - } - } - } -#endif - - closedir(dir); + closeDirectory(dir); } void LoadLevelSetup_SeriesInfo()