X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=e8ae45f215a6191d1dd508037279d21c2e303ba0;hb=5e616edfe5f101927d2ff3f7a14d2c65897de3cc;hp=51c6f646616827e29fe59134b4405355a167a0d2;hpb=2c4f8dc7bc7d04f5e23a6ad9f3e7594bf902ba56;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 51c6f646..e8ae45f2 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -270,19 +270,19 @@ static char *getDefaultMusicDir(char *music_subdir) static char *getDefaultArtworkSet(int type) { - return (type == TREE_TYPE_GRAPHICS_DIR ? GRAPHICS_SUBDIR : - type == TREE_TYPE_SOUNDS_DIR ? SOUNDS_SUBDIR : - type == TREE_TYPE_MUSIC_DIR ? MUSIC_SUBDIR : ""); + return (type == TREE_TYPE_GRAPHICS_DIR ? GFX_CLASSIC_SUBDIR : + type == TREE_TYPE_SOUNDS_DIR ? SND_CLASSIC_SUBDIR : + type == TREE_TYPE_MUSIC_DIR ? MUS_CLASSIC_SUBDIR : ""); } static char *getDefaultArtworkDir(int type) { return (type == TREE_TYPE_GRAPHICS_DIR ? - getDefaultGraphicsDir(GRAPHICS_SUBDIR) : + getDefaultGraphicsDir(GFX_CLASSIC_SUBDIR) : type == TREE_TYPE_SOUNDS_DIR ? - getDefaultSoundsDir(SOUNDS_SUBDIR) : + getDefaultSoundsDir(SND_CLASSIC_SUBDIR) : type == TREE_TYPE_MUSIC_DIR ? - getDefaultMusicDir(MUSIC_SUBDIR) : ""); + getDefaultMusicDir(MUS_CLASSIC_SUBDIR) : ""); } static char *getUserGraphicsDir() @@ -327,13 +327,13 @@ static char *getSetupArtworkDir(TreeInfo *ti) return artwork_dir; } -void setLevelArtworkDir(TreeInfo *ti) +char *setLevelArtworkDir(TreeInfo *ti) { char **artwork_path_ptr, **artwork_set_ptr; TreeInfo *level_artwork; if (ti == NULL || leveldir_current == NULL) - return; + return NULL; artwork_path_ptr = &(LEVELDIR_ARTWORK_PATH(leveldir_current, ti->type)); artwork_set_ptr = &(LEVELDIR_ARTWORK_SET( leveldir_current, ti->type)); @@ -370,6 +370,8 @@ void setLevelArtworkDir(TreeInfo *ti) free(dir); } + + return *artwork_set_ptr; } inline static char *getLevelArtworkSet(int type) @@ -446,7 +448,7 @@ char *getSetupFilename() return filename; } -static char *getCorrectedImageBasename(char *basename) +static char *getCorrectedArtworkBasename(char *basename) { char *basename_corrected = basename; @@ -461,7 +463,7 @@ static char *getCorrectedImageBasename(char *basename) /* 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) + if (strlen(basename_corrected) > 8 + 1 + 3) { static char *msdos_filename = NULL; @@ -469,7 +471,9 @@ static char *getCorrectedImageBasename(char *basename) free(msdos_filename); msdos_filename = getStringCopy(basename_corrected); - strncpy(&msdos_filename[8], &basename[strlen(basename) - 1+3], 1+3 + 1); + strncpy(&msdos_filename[8], &basename[strlen(basename) - (1+3)], 1+3 +1); + + basename_corrected = msdos_filename; } } #endif @@ -485,7 +489,7 @@ char *getCustomImageFilename(char *basename) if (filename != NULL) free(filename); - basename = getCorrectedImageBasename(basename); + basename = getCorrectedArtworkBasename(basename); if (!setup.override_level_graphics) { @@ -522,7 +526,7 @@ char *getCustomImageFilename(char *basename) } /* 4th try: look for default artwork in new default artwork directory */ - filename = getPath2(getDefaultGraphicsDir(GRAPHICS_SUBDIR), basename); + filename = getPath2(getDefaultGraphicsDir(GFX_CLASSIC_SUBDIR), basename); if (fileExists(filename)) return filename; @@ -544,6 +548,8 @@ char *getCustomSoundFilename(char *basename) if (filename != NULL) free(filename); + basename = getCorrectedArtworkBasename(basename); + if (!setup.override_level_sounds) { /* 1st try: look for special artwork in current level series directory */ @@ -579,7 +585,7 @@ char *getCustomSoundFilename(char *basename) } /* 4th try: look for default artwork in new default artwork directory */ - filename = getPath2(getDefaultSoundsDir(SOUNDS_SUBDIR), basename); + filename = getPath2(getDefaultSoundsDir(SND_CLASSIC_SUBDIR), basename); if (fileExists(filename)) return filename; @@ -663,7 +669,7 @@ char *getCustomMusicDirectory(void) } /* 4th try: look for default artwork in new default artwork directory */ - directory = getStringCopy(getDefaultMusicDir(MUSIC_SUBDIR)); + directory = getStringCopy(getDefaultMusicDir(MUS_CLASSIC_SUBDIR)); if (fileExists(directory)) return directory; @@ -853,8 +859,13 @@ void dumpTreeInfo(TreeInfo *node, int depth) for (i=0; i<(depth + 1) * 3; i++) printf(" "); +#if 1 + printf("filename == '%s' ['%s', '%s'] [%d])\n", + node->filename, node->fullpath, node->basepath, node->user_defined); +#else printf("filename == '%s' (%s) [%s] (%d)\n", node->filename, node->name, node->identifier, node->sort_priority); +#endif if (node->node_group != NULL) dumpTreeInfo(node->node_group, depth + 1); @@ -1497,12 +1508,14 @@ static void setTreeInfoToDefaults(TreeInfo *ldi, int type) if (ldi->type == TREE_TYPE_LEVEL_DIR) { ldi->imported_from = NULL; + ldi->graphics_set = NULL; ldi->sounds_set = NULL; ldi->music_set = NULL; ldi->graphics_path = getStringCopy(UNDEFINED_FILENAME); ldi->sounds_path = getStringCopy(UNDEFINED_FILENAME); ldi->music_path = getStringCopy(UNDEFINED_FILENAME); + ldi->levels = 0; ldi->first_level = 0; ldi->last_level = 0; @@ -1523,6 +1536,55 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ldi, TreeInfo *parent) return; } +#if 1 + /* copy all values from the parent structure */ + + ldi->type = parent->type; + + ldi->node_top = parent->node_top; + ldi->node_parent = parent; + ldi->node_group = NULL; + ldi->next = NULL; + + ldi->cl_first = -1; + ldi->cl_cursor = -1; + + ldi->filename = NULL; + ldi->fullpath = NULL; + ldi->basepath = NULL; + ldi->identifier = NULL; + ldi->name = getStringCopy(ANONYMOUS_NAME); + ldi->name_sorting = NULL; + ldi->author = getStringCopy(parent->author); + + ldi->sort_priority = parent->sort_priority; + ldi->parent_link = FALSE; + ldi->user_defined = parent->user_defined; + ldi->color = parent->color; + ldi->class_desc = getStringCopy(parent->class_desc); + + if (ldi->type == TREE_TYPE_LEVEL_DIR) + { + ldi->imported_from = getStringCopy(parent->imported_from); + + ldi->graphics_set = NULL; + ldi->sounds_set = NULL; + ldi->music_set = NULL; + ldi->graphics_path = getStringCopy(UNDEFINED_FILENAME); + ldi->sounds_path = getStringCopy(UNDEFINED_FILENAME); + ldi->music_path = getStringCopy(UNDEFINED_FILENAME); + + ldi->levels = 0; + ldi->first_level = 0; + ldi->last_level = 0; + ldi->level_group = FALSE; + ldi->handicap_level = 0; + ldi->readonly = TRUE; + } + + +#else + /* first copy all values from the parent structure ... */ *ldi = *parent; @@ -1540,7 +1602,16 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ldi, TreeInfo *parent) ldi->name = getStringCopy(ANONYMOUS_NAME); ldi->name_sorting = NULL; ldi->author = getStringCopy(parent->author); + ldi->imported_from = getStringCopy(parent->imported_from); + ldi->class_desc = getStringCopy(parent->class_desc); + + ldi->graphics_set = NULL; + ldi->sounds_set = NULL; + ldi->music_set = NULL; + ldi->graphics_path = NULL; + ldi->sounds_path = NULL; + ldi->music_path = NULL; ldi->level_group = FALSE; ldi->parent_link = FALSE; @@ -1549,6 +1620,47 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ldi, TreeInfo *parent) ldi->node_parent = parent; ldi->node_group = NULL; ldi->next = NULL; + +#endif +} + +static void freeTreeInfo(TreeInfo *ldi) +{ + if (ldi->filename) + free(ldi->filename); + if (ldi->fullpath) + free(ldi->fullpath); + if (ldi->basepath) + free(ldi->basepath); + if (ldi->identifier) + free(ldi->identifier); + + if (ldi->name) + free(ldi->name); + if (ldi->name_sorting) + free(ldi->name_sorting); + if (ldi->author) + free(ldi->author); + + if (ldi->class_desc) + free(ldi->class_desc); + + if (ldi->type == TREE_TYPE_LEVEL_DIR) + { + if (ldi->graphics_set) + free(ldi->graphics_set); + if (ldi->sounds_set) + free(ldi->sounds_set); + if (ldi->music_set) + free(ldi->music_set); + + if (ldi->graphics_path) + free(ldi->graphics_path); + if (ldi->sounds_path) + free(ldi->sounds_path); + if (ldi->music_path) + free(ldi->music_path); + } } void setSetupInfo(struct TokenInfo *token_info, @@ -1642,6 +1754,18 @@ static void createParentTreeInfoNode(TreeInfo *node_parent) ti_new->node_parent = node_parent; ti_new->parent_link = TRUE; +#if 1 + setString(&ti_new->identifier, node_parent->identifier); + setString(&ti_new->name, ".. (parent directory)"); + setString(&ti_new->name_sorting, ti_new->name); + + setString(&ti_new->filename, ".."); + setString(&ti_new->fullpath, node_parent->fullpath); + + ti_new->sort_priority = node_parent->sort_priority; + + setString(&ti_new->class_desc, getLevelClassDescription(ti_new)); +#else ti_new->identifier = getStringCopy(node_parent->identifier); ti_new->name = ".. (parent directory)"; ti_new->name_sorting = getStringCopy(ti_new->name); @@ -1650,7 +1774,9 @@ static void createParentTreeInfoNode(TreeInfo *node_parent) ti_new->fullpath = getStringCopy(node_parent->fullpath); ti_new->sort_priority = node_parent->sort_priority; + ti_new->class_desc = getLevelClassDescription(ti_new); +#endif pushTreeInfo(&node_parent->node_group, ti_new); } @@ -1697,11 +1823,16 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, getHashEntry(setup_file_hash, levelinfo_tokens[i].text)); *leveldir_new = ldi; +#if 1 + if (strcmp(leveldir_new->name, ANONYMOUS_NAME) == 0) + setString(&leveldir_new->name, leveldir_new->filename); +#else if (strcmp(leveldir_new->name, ANONYMOUS_NAME) == 0) { free(leveldir_new->name); leveldir_new->name = getStringCopy(leveldir_new->filename); } +#endif DrawInitText(leveldir_new->name, 150, FC_YELLOW); @@ -1713,12 +1844,12 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, if (node_parent == NULL) /* top level group */ { - leveldir_new->basepath = level_directory; - leveldir_new->fullpath = leveldir_new->filename; + leveldir_new->basepath = getStringCopy(level_directory); + leveldir_new->fullpath = getStringCopy(leveldir_new->filename); } else /* sub level group */ { - leveldir_new->basepath = node_parent->basepath; + leveldir_new->basepath = getStringCopy(node_parent->basepath); leveldir_new->fullpath = getPath2(node_parent->fullpath, directory_name); } @@ -1728,11 +1859,20 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, leveldir_new->last_level = leveldir_new->first_level + leveldir_new->levels - 1; +#if 1 + leveldir_new->user_defined = + (strcmp(leveldir_new->basepath, options.level_directory) != 0); +#else leveldir_new->user_defined = (leveldir_new->basepath == options.level_directory ? FALSE : TRUE); +#endif leveldir_new->color = LEVELCOLOR(leveldir_new); +#if 1 + setString(&leveldir_new->class_desc, getLevelClassDescription(leveldir_new)); +#else leveldir_new->class_desc = getLevelClassDescription(leveldir_new); +#endif leveldir_new->handicap_level = /* set handicap to default value */ (leveldir_new->user_defined ? @@ -1913,11 +2053,16 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, getHashEntry(setup_file_hash, levelinfo_tokens[i].text)); *artwork_new = ldi; +#if 1 + if (strcmp(artwork_new->name, ANONYMOUS_NAME) == 0) + setString(&artwork_new->name, artwork_new->filename); +#else if (strcmp(artwork_new->name, ANONYMOUS_NAME) == 0) { free(artwork_new->name); artwork_new->name = getStringCopy(artwork_new->filename); } +#endif #if 0 DrawInitText(artwork_new->name, 150, FC_YELLOW); @@ -1941,42 +2086,86 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, artwork_new->fullpath = getPath2(node_parent->fullpath, directory_name); } +#if 1 + artwork_new->user_defined = + (strcmp(artwork_new->basepath, OPTIONS_ARTWORK_DIRECTORY(type)) != 0); +#else artwork_new->user_defined = (artwork_new->basepath == OPTIONS_ARTWORK_DIRECTORY(type) ? FALSE : TRUE); +#endif /* (may use ".sort_priority" from "setup_file_hash" above) */ artwork_new->color = ARTWORKCOLOR(artwork_new); +#if 1 + setString(&artwork_new->class_desc, getLevelClassDescription(artwork_new)); +#else artwork_new->class_desc = getLevelClassDescription(artwork_new); +#endif if (setup_file_hash == NULL) /* (after determining ".user_defined") */ { +#if 0 if (artwork_new->name != NULL) + { free(artwork_new->name); + artwork_new->name = NULL; + } +#endif + +#if 0 + if (artwork_new->identifier != NULL) + { + free(artwork_new->identifier); + artwork_new->identifier = NULL; + } +#endif if (strcmp(artwork_new->filename, ".") == 0) { if (artwork_new->user_defined) { +#if 1 + setString(&artwork_new->identifier, "private"); +#else artwork_new->identifier = getStringCopy("private"); +#endif artwork_new->sort_priority = ARTWORKCLASS_USER; } else { +#if 1 + setString(&artwork_new->identifier, "classic"); +#else artwork_new->identifier = getStringCopy("classic"); +#endif artwork_new->sort_priority = ARTWORKCLASS_CLASSICS; } /* set to new values after changing ".sort_priority" */ artwork_new->color = ARTWORKCOLOR(artwork_new); +#if 1 + setString(&artwork_new->class_desc, + getLevelClassDescription(artwork_new)); +#else artwork_new->class_desc = getLevelClassDescription(artwork_new); +#endif } else { +#if 1 + setString(&artwork_new->identifier, artwork_new->filename); +#else artwork_new->identifier = getStringCopy(artwork_new->filename); +#endif } +#if 1 + setString(&artwork_new->name, artwork_new->identifier); + setString(&artwork_new->name_sorting, artwork_new->name); +#else artwork_new->name = getStringCopy(artwork_new->identifier); artwork_new->name_sorting = getStringCopy(artwork_new->name); +#endif } DrawInitText(artwork_new->name, 150, FC_YELLOW); @@ -2054,6 +2243,15 @@ static TreeInfo *getDummyArtworkInfo(int type) setTreeInfoToDefaults(artwork_new, type); +#if 1 + setString(&artwork_new->filename, UNDEFINED_FILENAME); + setString(&artwork_new->fullpath, UNDEFINED_FILENAME); + setString(&artwork_new->basepath, UNDEFINED_FILENAME); + + setString(&artwork_new->identifier, UNDEFINED_FILENAME); + setString(&artwork_new->name, UNDEFINED_FILENAME); + setString(&artwork_new->name_sorting, UNDEFINED_FILENAME); +#else artwork_new->filename = getStringCopy(UNDEFINED_FILENAME); artwork_new->fullpath = getStringCopy(UNDEFINED_FILENAME); artwork_new->basepath = getStringCopy(UNDEFINED_FILENAME); @@ -2064,6 +2262,7 @@ static TreeInfo *getDummyArtworkInfo(int type) artwork_new->identifier = getStringCopy(UNDEFINED_FILENAME); artwork_new->name = getStringCopy(UNDEFINED_FILENAME); artwork_new->name_sorting = getStringCopy(UNDEFINED_FILENAME); +#endif return artwork_new; } @@ -2105,7 +2304,7 @@ void LoadArtworkInfo() getTreeInfoFromIdentifier(artwork.gfx_first, setup.graphics_set); if (artwork.gfx_current == NULL) artwork.gfx_current = - getTreeInfoFromIdentifier(artwork.gfx_first, GRAPHICS_SUBDIR); + getTreeInfoFromIdentifier(artwork.gfx_first, GFX_CLASSIC_SUBDIR); if (artwork.gfx_current == NULL) artwork.gfx_current = getFirstValidTreeInfoEntry(artwork.gfx_first); @@ -2113,7 +2312,7 @@ void LoadArtworkInfo() getTreeInfoFromIdentifier(artwork.snd_first, setup.sounds_set); if (artwork.snd_current == NULL) artwork.snd_current = - getTreeInfoFromIdentifier(artwork.snd_first, SOUNDS_SUBDIR); + getTreeInfoFromIdentifier(artwork.snd_first, SND_CLASSIC_SUBDIR); if (artwork.snd_current == NULL) artwork.snd_current = getFirstValidTreeInfoEntry(artwork.snd_first); @@ -2121,7 +2320,7 @@ void LoadArtworkInfo() getTreeInfoFromIdentifier(artwork.mus_first, setup.music_set); if (artwork.mus_current == NULL) artwork.mus_current = - getTreeInfoFromIdentifier(artwork.mus_first, MUSIC_SUBDIR); + getTreeInfoFromIdentifier(artwork.mus_first, MUS_CLASSIC_SUBDIR); if (artwork.mus_current == NULL) artwork.mus_current = getFirstValidTreeInfoEntry(artwork.mus_first); @@ -2202,13 +2401,14 @@ void LoadLevelArtworkInfo() LoadArtworkInfoFromLevelInfo(&artwork.mus_first, leveldir_first); /* needed for reloading level artwork not known at ealier stage */ + if (strcmp(artwork.gfx_current_identifier, setup.graphics_set) != 0) { artwork.gfx_current = getTreeInfoFromIdentifier(artwork.gfx_first, setup.graphics_set); if (artwork.gfx_current == NULL) artwork.gfx_current = - getTreeInfoFromIdentifier(artwork.gfx_first, GRAPHICS_SUBDIR); + getTreeInfoFromIdentifier(artwork.gfx_first, GFX_CLASSIC_SUBDIR); if (artwork.gfx_current == NULL) artwork.gfx_current = getFirstValidTreeInfoEntry(artwork.gfx_first); } @@ -2219,7 +2419,7 @@ void LoadLevelArtworkInfo() getTreeInfoFromIdentifier(artwork.snd_first, setup.sounds_set); if (artwork.snd_current == NULL) artwork.snd_current = - getTreeInfoFromIdentifier(artwork.snd_first, SOUNDS_SUBDIR); + getTreeInfoFromIdentifier(artwork.snd_first, SND_CLASSIC_SUBDIR); if (artwork.snd_current == NULL) artwork.snd_current = getFirstValidTreeInfoEntry(artwork.snd_first); } @@ -2230,7 +2430,7 @@ void LoadLevelArtworkInfo() getTreeInfoFromIdentifier(artwork.mus_first, setup.music_set); if (artwork.mus_current == NULL) artwork.mus_current = - getTreeInfoFromIdentifier(artwork.mus_first, MUSIC_SUBDIR); + getTreeInfoFromIdentifier(artwork.mus_first, MUS_CLASSIC_SUBDIR); if (artwork.mus_current == NULL) artwork.mus_current = getFirstValidTreeInfoEntry(artwork.mus_first); } @@ -2248,6 +2448,7 @@ void LoadLevelArtworkInfo() static void SaveUserLevelInfo() { + LevelDirTree *level_info; char *filename; FILE *file; int i; @@ -2261,22 +2462,37 @@ static void SaveUserLevelInfo() return; } - /* always start with reliable default values */ - setTreeInfoToDefaults(&ldi, TREE_TYPE_LEVEL_DIR); + level_info = newTreeInfo(); + /* always start with reliable default values */ + setTreeInfoToDefaults(level_info, TREE_TYPE_LEVEL_DIR); + +#if 1 + setString(&level_info->name, getLoginName()); + setString(&level_info->author, getRealName()); + level_info->levels = 100; + level_info->first_level = 1; + level_info->sort_priority = LEVELCLASS_USER_START; + level_info->readonly = FALSE; + setString(&level_info->graphics_set, GFX_CLASSIC_SUBDIR); + setString(&level_info->sounds_set, SND_CLASSIC_SUBDIR); + setString(&level_info->music_set, MUS_CLASSIC_SUBDIR); +#else ldi.name = getStringCopy(getLoginName()); ldi.author = getStringCopy(getRealName()); ldi.levels = 100; ldi.first_level = 1; ldi.sort_priority = LEVELCLASS_USER_START; ldi.readonly = FALSE; - ldi.graphics_set = getStringCopy(GRAPHICS_SUBDIR); - ldi.sounds_set = getStringCopy(SOUNDS_SUBDIR); - ldi.music_set = getStringCopy(MUSIC_SUBDIR); + ldi.graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR); + ldi.sounds_set = getStringCopy(SND_CLASSIC_SUBDIR); + ldi.music_set = getStringCopy(MUS_CLASSIC_SUBDIR); +#endif fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, getCookie("LEVELINFO"))); + ldi = *level_info; for (i=0; i