X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=6ad11351d1dca59eea56a49bb080f0dd5a7dd915;hb=7891415ca10eb882506eaaa3bca720ec75723a0e;hp=122f1dfe2a8415bdbacc9784e2e9bb4d3d658428;hpb=884db54d739f5838243315f390d28634cb99a7d9;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 122f1dfe..6ad11351 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -79,10 +79,32 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] = IS_LEVELCLASS_USER(n) ? 7 : \ 9) -#define TOKEN_VALUE_POSITION 30 +#define TOKEN_VALUE_POSITION 40 +#define TOKEN_COMMENT_POSITION 60 #define MAX_COOKIE_LEN 256 +#define ARTWORKINFO_FILENAME(type) ((type) == TREE_TYPE_GRAPHICS_DIR ? \ + GRAPHICSINFO_FILENAME : \ + (type) == TREE_TYPE_SOUNDS_DIR ? \ + SOUNDSINFO_FILENAME : \ + (type) == TREE_TYPE_MUSIC_DIR ? \ + MUSICINFO_FILENAME : "") + +#define ARTWORK_DIRECTORY(type) ((type) == TREE_TYPE_GRAPHICS_DIR ? \ + GRAPHICS_DIRECTORY : \ + (type) == TREE_TYPE_SOUNDS_DIR ? \ + SOUNDS_DIRECTORY : \ + (type) == TREE_TYPE_MUSIC_DIR ? \ + MUSIC_DIRECTORY : "") + +#define OPTIONS_ARTWORK_DIRECTORY(type) ((type) == TREE_TYPE_GRAPHICS_DIR ? \ + options.graphics_directory : \ + (type) == TREE_TYPE_SOUNDS_DIR ? \ + options.sounds_directory : \ + (type) == TREE_TYPE_MUSIC_DIR ? \ + options.music_directory : "") + /* ------------------------------------------------------------------------- */ /* file functions */ @@ -166,23 +188,27 @@ static char *getLevelSetupDir(char *level_subdir) return levelsetup_dir; } -static char *getCurrentLevelDir() +static char *getLevelDirFromTreeInfo(TreeInfo *node) { static char *level_dir = NULL; + if (node == NULL) + return options.level_directory; + if (level_dir) free(level_dir); - if (leveldir_current == NULL) - return options.level_directory; - - level_dir = getPath2((leveldir_current->user_defined ? - getUserLevelDir(NULL) : options.level_directory), - leveldir_current->fullpath); + level_dir = getPath2((node->user_defined ? getUserLevelDir(NULL) : + options.level_directory), node->fullpath); return level_dir; } +static char *getCurrentLevelDir() +{ + return getLevelDirFromTreeInfo(leveldir_current); +} + static char *getDefaultGraphicsDir(char *graphics_subdir) { static char *graphics_dir = NULL; @@ -394,15 +420,19 @@ char *getCustomSoundFilename(char *basename) if (filename != NULL) free(filename); +#if 0 /* 1st try: look for special artwork in current level series directory */ filename = getPath3(getCurrentLevelDir(), SOUNDS_DIRECTORY, basename); if (fileExists(filename)) return filename; +#endif +#if 0 /* 2nd try: look for special artwork in private artwork directory */ filename = getPath2(getUserSoundsDir(), basename); if (fileExists(filename)) return filename; +#endif /* 3rd try: look for special artwork in configured artwork directory */ filename = getPath2(getSetupArtworkDir(artwork.snd_current), basename); @@ -422,6 +452,11 @@ char *getCustomSoundFilename(char *basename) return NULL; /* cannot find image file */ } +char *getCustomSoundConfigFilename() +{ + return getCustomSoundFilename(SOUNDSINFO_FILENAME); +} + char *getCustomMusicDirectory(void) { static char *directory = NULL; @@ -685,7 +720,8 @@ void dumpTreeInfo(TreeInfo *node, int depth) for (i=0; i<(depth + 1) * 3; i++) printf(" "); - printf("filename == '%s' [%s]\n", node->filename, node->name); + printf("filename == '%s' (%s) [%s]\n", + node->filename, node->name, node->name_short); if (node->node_group != NULL) dumpTreeInfo(node->node_group, depth + 1); @@ -978,11 +1014,12 @@ char *getFormattedSetupEntry(char *token, char *value) int i; static char entry[MAX_LINE_LEN]; + /* start with the token and some spaces to format output line */ sprintf(entry, "%s:", token); for (i=strlen(entry); iname, ANONYMOUS_NAME) == 0) + { + free(leveldir_new->name); + leveldir_new->name = getStringCopy(leveldir_new->filename); + } + DrawInitText(leveldir_new->name, 150, FC_YELLOW); if (leveldir_new->name_short == NULL) @@ -1520,6 +1563,11 @@ static void LoadLevelInfoFromLevelDir(TreeInfo **node_first, free(directory_path); + if (strcmp(directory_name, GRAPHICS_DIRECTORY) == 0 || + strcmp(directory_name, SOUNDS_DIRECTORY) == 0 || + strcmp(directory_name, MUSIC_DIRECTORY) == 0) + continue; + valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent, level_directory, directory_name); @@ -1567,18 +1615,13 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, char *directory_name, int type) { char *directory_path = getPath2(base_directory, directory_name); - char *filename = - getPath2(directory_path, - (type == TREE_TYPE_GRAPHICS_DIR ? GRAPHICSINFO_FILENAME : - type == TREE_TYPE_SOUNDS_DIR ? SOUNDSINFO_FILENAME : - type == TREE_TYPE_MUSIC_DIR ? MUSICINFO_FILENAME : "")); + char *filename = getPath2(directory_path, ARTWORKINFO_FILENAME(type)); struct SetupFileList *setup_file_list = NULL; TreeInfo *artwork_new = NULL; - char *check_dir = NULL; int i; if (access(filename, F_OK) == 0) /* file exists */ - loadSetupFileList(filename); + setup_file_list = loadSetupFileList(filename); if (setup_file_list == NULL) /* no config file -- look for artwork files */ { @@ -1592,9 +1635,7 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, { char *entry_name = dir_entry->d_name; - if ((type == TREE_TYPE_GRAPHICS_DIR && FileIsGraphic(entry_name)) || - (type == TREE_TYPE_SOUNDS_DIR && FileIsSound(entry_name)) || - (type == TREE_TYPE_MUSIC_DIR && FileIsMusic(entry_name))) + if (FileIsArtworkType(entry_name, type)) { valid_file_found = TRUE; break; @@ -1606,8 +1647,8 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, if (!valid_file_found) { - if (options.debug) - Error(ERR_WARN, "ignoring artwork directory '%s'", base_directory); + if (strcmp(directory_name, ".") != 0) + Error(ERR_WARN, "ignoring artwork directory '%s'", directory_path); free(directory_path); free(filename); @@ -1638,6 +1679,12 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, getTokenValue(setup_file_list, levelinfo_tokens[i].text)); *artwork_new = ldi; + if (strcmp(artwork_new->name, ANONYMOUS_NAME) == 0) + { + free(artwork_new->name); + artwork_new->name = getStringCopy(artwork_new->filename); + } + DrawInitText(artwork_new->name, 150, FC_YELLOW); if (artwork_new->name_short == NULL) @@ -1658,11 +1705,8 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, artwork_new->fullpath = getPath2(node_parent->fullpath, directory_name); } - check_dir = (type == TREE_TYPE_GRAPHICS_DIR ? options.graphics_directory : - type == TREE_TYPE_SOUNDS_DIR ? options.sounds_directory : - type == TREE_TYPE_MUSIC_DIR ? options.music_directory : ""); artwork_new->user_defined = - (artwork_new->basepath == check_dir ? FALSE : TRUE); + (artwork_new->basepath == OPTIONS_ARTWORK_DIRECTORY(type) ? FALSE : TRUE); /* (may use ".sort_priority" from "setup_file_list" above) */ artwork_new->color = LEVELCOLOR(artwork_new); @@ -1676,9 +1720,18 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, if (strcmp(artwork_new->filename, ".") == 0) { if (artwork_new->user_defined) + { artwork_new->name = getStringCopy("private"); + artwork_new->sort_priority = LEVELCLASS_USER; + } else - artwork_new->name = getStringCopy("default"); + { + artwork_new->name = getStringCopy("classic"); + artwork_new->sort_priority = LEVELCLASS_CLASSICS; + } + + artwork_new->color = LEVELCOLOR(artwork_new); + artwork_new->class_desc = getLevelClassDescription(artwork_new); } else artwork_new->name = getStringCopy(artwork_new->filename); @@ -1707,12 +1760,7 @@ static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first, if ((dir = opendir(base_directory)) == NULL) { - if ((type == TREE_TYPE_GRAPHICS_DIR && - base_directory == options.graphics_directory) || - (type == TREE_TYPE_SOUNDS_DIR && - base_directory == options.sounds_directory) || - (type == TREE_TYPE_MUSIC_DIR && - base_directory == options.music_directory)) + if (base_directory == OPTIONS_ARTWORK_DIRECTORY(type)) Error(ERR_WARN, "cannot read directory '%s'", base_directory); return; } @@ -1803,6 +1851,12 @@ void LoadArtworkInfo() artwork.sounds_set_current = artwork.snd_current->name; artwork.music_set_current = artwork.mus_current->name; +#if 0 + printf("graphics set == %s\n\n", artwork.graphics_set_current); + printf("sounds set == %s\n\n", artwork.sounds_set_current); + printf("music set == %s\n\n", artwork.music_set_current); +#endif + sortTreeInfo(&artwork.gfx_first, compareTreeInfoEntries); sortTreeInfo(&artwork.snd_first, compareTreeInfoEntries); sortTreeInfo(&artwork.mus_first, compareTreeInfoEntries); @@ -1814,22 +1868,69 @@ void LoadArtworkInfo() #endif } -void LoadSoundsInfo() +void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node, + LevelDirTree *level_node) { -#if 0 - char *filename = getCustomSoundFilename(SOUNDSINFO_FILENAME); - struct SetupFileList *setup_file_list = loadSetupFileList(filename); + /* recursively check all level directories for artwork sub-directories */ - if (setup_file_list) + while (level_node) { + char *path = getPath2(getLevelDirFromTreeInfo(level_node), + ARTWORK_DIRECTORY((*artwork_node)->type)); + #if 0 - for (i=0; iparent_link) + printf("CHECKING '%s' ['%s', '%s'] ...\n", path, + level_node->filename, level_node->name); #endif - freeSetupFileList(setup_file_list); + if (!level_node->parent_link) + { + TreeInfo *topnode_last = *artwork_node; + + LoadArtworkInfoFromArtworkDir(artwork_node, NULL, path, + (*artwork_node)->type); + + if (topnode_last != *artwork_node) + { + free((*artwork_node)->name); + free((*artwork_node)->name_sorting); + free((*artwork_node)->name_short); + + (*artwork_node)->name = getStringCopy(level_node->name); + (*artwork_node)->name_sorting = getStringCopy(level_node->name); + (*artwork_node)->name_short = getStringCopy(level_node->filename); + + (*artwork_node)->sort_priority = level_node->sort_priority; + (*artwork_node)->color = LEVELCOLOR((*artwork_node)); + } + } + + free(path); + + if (level_node->node_group != NULL) + LoadArtworkInfoFromLevelInfo(artwork_node, level_node->node_group); + + level_node = level_node->next; } +} + +void LoadLevelArtworkInfo() +{ + DrawInitText("Looking for custom level artwork:", 120, FC_GREEN); + + LoadArtworkInfoFromLevelInfo(&artwork.gfx_first, leveldir_first); + LoadArtworkInfoFromLevelInfo(&artwork.snd_first, leveldir_first); + LoadArtworkInfoFromLevelInfo(&artwork.mus_first, leveldir_first); + + sortTreeInfo(&artwork.gfx_first, compareTreeInfoEntries); + sortTreeInfo(&artwork.snd_first, compareTreeInfoEntries); + sortTreeInfo(&artwork.mus_first, compareTreeInfoEntries); + +#if 1 + dumpTreeInfo(artwork.gfx_first, 0); + dumpTreeInfo(artwork.snd_first, 0); + dumpTreeInfo(artwork.mus_first, 0); #endif } @@ -1918,19 +2019,18 @@ char *getSetupValue(int type, void *value) char *getSetupLine(struct TokenInfo *token_info, char *prefix, int token_nr) { int i; - static char entry[MAX_LINE_LEN]; + char *line; + static char token_string[MAX_LINE_LEN]; int token_type = token_info[token_nr].type; void *setup_value = token_info[token_nr].value; char *token_text = token_info[token_nr].text; char *value_string = getSetupValue(token_type, setup_value); - /* start with the prefix, token and some spaces to format output line */ - sprintf(entry, "%s%s:", prefix, token_text); - for (i=strlen(entry); i