X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=614bb613cec6cc7185c78f423daca63193f7d89d;hb=8afc6199767a6fcb7451efd2b3d5b070f6c99efb;hp=6c49cac933aeff7402e042bb24677325ee9f1357;hpb=f60e97c16b1c14ffd21d9f9ca86ad0be52dfa9b4;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 6c49cac9..614bb613 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -11,8 +11,9 @@ * setup.c * ***********************************************************/ -#include +#include #include +#include #include #include @@ -79,6 +80,18 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] = IS_LEVELCLASS_USER(n) ? 7 : \ 9) +#define ARTWORKCOLOR(n) (IS_ARTWORKCLASS_CLASSICS(n) ? FC_RED : \ + IS_ARTWORKCLASS_CONTRIBUTION(n) ? FC_YELLOW : \ + IS_ARTWORKCLASS_LEVEL(n) ? FC_GREEN : \ + IS_ARTWORKCLASS_USER(n) ? FC_RED : \ + FC_BLUE) + +#define ARTWORKSORTING(n) (IS_ARTWORKCLASS_CLASSICS(n) ? 0 : \ + IS_ARTWORKCLASS_CONTRIBUTION(n) ? 1 : \ + IS_ARTWORKCLASS_LEVEL(n) ? 2 : \ + IS_ARTWORKCLASS_USER(n) ? 3 : \ + 9) + #define TOKEN_VALUE_POSITION 40 #define TOKEN_COMMENT_POSITION 60 @@ -284,6 +297,61 @@ static char *getUserMusicDir() return usermusic_dir; } +static char *getSetupArtworkDir(TreeInfo *ti) +{ + static char *artwork_dir = NULL; + + if (artwork_dir != NULL) + free(artwork_dir); + + artwork_dir = getPath2(ti->basepath, ti->fullpath); + + return artwork_dir; +} + +void setLevelArtworkDir(TreeInfo *ti) +{ + char **artwork_path_ptr, *artwork_set; + TreeInfo *level_artwork; + + if (ti == NULL || leveldir_current == NULL) + return; + + artwork_path_ptr = + (ti->type == TREE_TYPE_GRAPHICS_DIR ? &leveldir_current->graphics_path : + ti->type == TREE_TYPE_SOUNDS_DIR ? &leveldir_current->sounds_path : + &leveldir_current->music_path); + + artwork_set = + (ti->type == TREE_TYPE_GRAPHICS_DIR ? leveldir_current->graphics_set : + ti->type == TREE_TYPE_SOUNDS_DIR ? leveldir_current->sounds_set : + leveldir_current->music_set); + + if ((level_artwork = getTreeInfoFromIdentifier(ti, artwork_set)) == NULL) + return; + + if (*artwork_path_ptr != NULL) + free(*artwork_path_ptr); + + *artwork_path_ptr = getStringCopy(getSetupArtworkDir(level_artwork)); +} + +static char *getLevelArtworkDir(int type) +{ + char *artwork_path; + + if (leveldir_current == NULL) + return UNDEFINED_FILENAME; + + artwork_path = + (type == TREE_TYPE_GRAPHICS_DIR ? leveldir_current->graphics_path : + type == TREE_TYPE_SOUNDS_DIR ? leveldir_current->sounds_path : + type == TREE_TYPE_MUSIC_DIR ? leveldir_current->music_path : + UNDEFINED_FILENAME); + + return artwork_path; +} + char *getLevelFilename(int nr) { static char *filename = NULL; @@ -338,21 +406,9 @@ char *getSetupFilename() return filename; } -static char *getSetupArtworkDir(TreeInfo *ti) -{ - static char *artwork_dir = NULL; - - if (artwork_dir != NULL) - free(artwork_dir); - - artwork_dir = getPath2(ti->basepath, ti->fullpath); - - return artwork_dir; -} - static char *getCorrectedImageBasename(char *basename) { - char *result = basename; + char *basename_corrected = basename; #if defined(PLATFORM_MSDOS) if (program.filename_prefix != NULL) @@ -360,11 +416,25 @@ static char *getCorrectedImageBasename(char *basename) int prefix_len = strlen(program.filename_prefix); if (strncmp(basename, program.filename_prefix, prefix_len) == 0) - result = &basename[prefix_len]; + 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; + + if (filename != NULL) + free(filename); + + filename = getStringCopy(basename_corrected); + strncpy(&filename[8], &basename[strlen(basename) - 1+3], 1+3 + 1); + } } #endif - return result; + return basename_corrected; } static boolean fileExists(char *filename) @@ -387,23 +457,28 @@ char *getCustomImageFilename(char *basename) if (!setup.override_level_graphics) { - /* 1st try: look for special artwork in current level series directory */ + /* 1st try: look for special artwork configured in level series config */ + filename = getPath2(getLevelArtworkDir(TREE_TYPE_GRAPHICS_DIR), basename); + if (fileExists(filename)) + return filename; + + /* 2nd try: look for special artwork in current level series directory */ filename = getPath3(getCurrentLevelDir(), GRAPHICS_DIRECTORY, basename); if (fileExists(filename)) return filename; } - /* 2nd try: look for special artwork in configured artwork directory */ + /* 3rd try: look for special artwork in configured artwork directory */ filename = getPath2(getSetupArtworkDir(artwork.gfx_current), basename); if (fileExists(filename)) return filename; - /* 3rd try: look for default artwork in new default artwork directory */ + /* 4th try: look for default artwork in new default artwork directory */ filename = getPath2(getDefaultGraphicsDir(GRAPHICS_SUBDIR), basename); if (fileExists(filename)) return filename; - /* 4th try: look for default artwork in old default artwork directory */ + /* 5th try: look for default artwork in old default artwork directory */ filename = getPath2(options.graphics_directory, basename); if (fileExists(filename)) return filename; @@ -420,23 +495,28 @@ char *getCustomSoundFilename(char *basename) if (!setup.override_level_sounds) { - /* 1st try: look for special artwork in current level series directory */ + /* 1st try: look for special artwork configured in level series config */ + filename = getPath2(getLevelArtworkDir(TREE_TYPE_SOUNDS_DIR), basename); + if (fileExists(filename)) + return filename; + + /* 2nd try: look for special artwork in current level series directory */ filename = getPath3(getCurrentLevelDir(), SOUNDS_DIRECTORY, basename); if (fileExists(filename)) return filename; } - /* 2nd try: look for special artwork in configured artwork directory */ + /* 3rd try: look for special artwork in configured artwork directory */ filename = getPath2(getSetupArtworkDir(artwork.snd_current), basename); if (fileExists(filename)) return filename; - /* 3rd try: look for default artwork in new default artwork directory */ + /* 4th try: look for default artwork in new default artwork directory */ filename = getPath2(getDefaultSoundsDir(SOUNDS_SUBDIR), basename); if (fileExists(filename)) return filename; - /* 4th try: look for default artwork in old default artwork directory */ + /* 5th try: look for default artwork in old default artwork directory */ filename = getPath2(options.sounds_directory, basename); if (fileExists(filename)) return filename; @@ -444,9 +524,19 @@ char *getCustomSoundFilename(char *basename) return NULL; /* cannot find specified artwork file anywhere */ } -char *getCustomSoundConfigFilename() +char *getCustomArtworkFilename(char *basename, int type) { - return getCustomSoundFilename(SOUNDSINFO_FILENAME); + if (type == ARTWORK_TYPE_GRAPHICS) + return getCustomImageFilename(basename); + else if (type == ARTWORK_TYPE_SOUNDS) + return getCustomSoundFilename(basename); + else + return UNDEFINED_FILENAME; +} + +char *getCustomArtworkConfigFilename(int type) +{ + return getCustomArtworkFilename(ARTWORKINFO_FILENAME(type), type); } char *getCustomMusicDirectory(void) @@ -458,23 +548,28 @@ char *getCustomMusicDirectory(void) if (!setup.override_level_music) { - /* 1st try: look for special artwork in current level series directory */ + /* 1st try: look for special artwork configured in level series config */ + directory = getStringCopy(getLevelArtworkDir(TREE_TYPE_MUSIC_DIR)); + if (fileExists(directory)) + return directory; + + /* 2nd try: look for special artwork in current level series directory */ directory = getPath2(getCurrentLevelDir(), MUSIC_DIRECTORY); if (fileExists(directory)) return directory; } - /* 2nd try: look for special artwork in configured artwork directory */ + /* 3rd try: look for special artwork in configured artwork directory */ directory = getStringCopy(getSetupArtworkDir(artwork.mus_current)); if (fileExists(directory)) return directory; - /* 3rd try: look for default artwork in new default artwork directory */ + /* 4th try: look for default artwork in new default artwork directory */ directory = getStringCopy(getDefaultMusicDir(MUSIC_SUBDIR)); if (fileExists(directory)) return directory; - /* 4th try: look for default artwork in old default artwork directory */ + /* 5th try: look for default artwork in old default artwork directory */ directory = getStringCopy(options.music_directory); if (fileExists(directory)) return directory; @@ -618,9 +713,9 @@ TreeInfo *getTreeInfoFromPos(TreeInfo *node, int pos) return node_default; } -TreeInfo *getTreeInfoFromFilenameExt(TreeInfo *node, char *filename) +TreeInfo *getTreeInfoFromIdentifier(TreeInfo *node, char *identifier) { - if (filename == NULL) + if (identifier == NULL) return NULL; while (node) @@ -629,20 +724,14 @@ TreeInfo *getTreeInfoFromFilenameExt(TreeInfo *node, char *filename) { TreeInfo *node_group; - node_group = getTreeInfoFromFilenameExt(node->node_group, filename); + node_group = getTreeInfoFromIdentifier(node->node_group, identifier); if (node_group) return node_group; } else if (!node->parent_link) { - if (strcmp(filename, node->filename) == 0) - return node; - - /* special case when looking for level series artwork: - node->name_short contains level series filename */ - if (strcmp(node->filename, ".") == 0 && - strcmp(filename, node->name_short) == 0) + if (strcmp(identifier, node->identifier) == 0) return node; } @@ -652,11 +741,6 @@ TreeInfo *getTreeInfoFromFilenameExt(TreeInfo *node, char *filename) return NULL; } -TreeInfo *getTreeInfoFromFilename(TreeInfo *ti, char *filename) -{ - return getTreeInfoFromFilenameExt(ti, filename); -} - void dumpTreeInfo(TreeInfo *node, int depth) { int i; @@ -668,8 +752,8 @@ void dumpTreeInfo(TreeInfo *node, int depth) for (i=0; i<(depth + 1) * 3; i++) printf(" "); - printf("filename == '%s' (%s) [%s]\n", - node->filename, node->name, node->name_short); + printf("filename == '%s' (%s) [%s] (%d)\n", + node->filename, node->name, node->identifier, node->sort_priority); if (node->node_group != NULL) dumpTreeInfo(node->node_group, depth + 1); @@ -1166,8 +1250,8 @@ void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, #define TOKEN_STR_HANDICAP_LEVEL "handicap_level" /* level directory info */ -#define LEVELINFO_TOKEN_NAME 0 -#define LEVELINFO_TOKEN_NAME_SHORT 1 +#define LEVELINFO_TOKEN_IDENTIFIER 0 +#define LEVELINFO_TOKEN_NAME 1 #define LEVELINFO_TOKEN_NAME_SORTING 2 #define LEVELINFO_TOKEN_AUTHOR 3 #define LEVELINFO_TOKEN_IMPORTED_FROM 4 @@ -1176,16 +1260,19 @@ void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, #define LEVELINFO_TOKEN_SORT_PRIORITY 7 #define LEVELINFO_TOKEN_LEVEL_GROUP 8 #define LEVELINFO_TOKEN_READONLY 9 +#define LEVELINFO_TOKEN_GRAPHICS_SET 10 +#define LEVELINFO_TOKEN_SOUNDS_SET 11 +#define LEVELINFO_TOKEN_MUSIC_SET 12 -#define NUM_LEVELINFO_TOKENS 10 +#define NUM_LEVELINFO_TOKENS 13 static LevelDirTree ldi; static struct TokenInfo levelinfo_tokens[] = { /* level directory info */ + { TYPE_STRING, &ldi.identifier, "identifier" }, { TYPE_STRING, &ldi.name, "name" }, - { TYPE_STRING, &ldi.name_short, "name_short" }, { TYPE_STRING, &ldi.name_sorting, "name_sorting" }, { TYPE_STRING, &ldi.author, "author" }, { TYPE_STRING, &ldi.imported_from, "imported_from" }, @@ -1193,7 +1280,10 @@ static struct TokenInfo levelinfo_tokens[] = { TYPE_INTEGER, &ldi.first_level, "first_level" }, { TYPE_INTEGER, &ldi.sort_priority, "sort_priority" }, { TYPE_BOOLEAN, &ldi.level_group, "level_group" }, - { TYPE_BOOLEAN, &ldi.readonly, "readonly" } + { TYPE_BOOLEAN, &ldi.readonly, "readonly" }, + { TYPE_STRING, &ldi.graphics_set, "graphics_set" }, + { TYPE_STRING, &ldi.sounds_set, "sounds_set" }, + { TYPE_STRING, &ldi.music_set, "music_set" } }; static void setTreeInfoToDefaults(TreeInfo *ldi, int type) @@ -1216,8 +1306,8 @@ static void setTreeInfoToDefaults(TreeInfo *ldi, int type) ldi->filename = NULL; ldi->fullpath = NULL; ldi->basepath = NULL; + ldi->identifier = NULL; ldi->name = getStringCopy(ANONYMOUS_NAME); - ldi->name_short = NULL; ldi->name_sorting = NULL; ldi->author = getStringCopy(ANONYMOUS_NAME); @@ -1230,6 +1320,12 @@ 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; @@ -1262,8 +1358,8 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ldi, TreeInfo *parent) ldi->filename = NULL; ldi->fullpath = NULL; ldi->basepath = NULL; + ldi->identifier = NULL; ldi->name = getStringCopy(ANONYMOUS_NAME); - ldi->name_short = NULL; ldi->name_sorting = NULL; ldi->author = getStringCopy(parent->author); ldi->imported_from = getStringCopy(parent->imported_from); @@ -1321,8 +1417,20 @@ static int compareTreeInfoEntries(const void *object1, const void *object2) { const TreeInfo *entry1 = *((TreeInfo **)object1); const TreeInfo *entry2 = *((TreeInfo **)object2); + int class_sorting1, class_sorting2; int compare_result; + if (entry1->type == TREE_TYPE_LEVEL_DIR) + { + class_sorting1 = LEVELSORTING(entry1); + class_sorting2 = LEVELSORTING(entry2); + } + else + { + class_sorting1 = ARTWORKSORTING(entry1); + class_sorting2 = ARTWORKSORTING(entry2); + } + if (entry1->parent_link || entry2->parent_link) compare_result = (entry1->parent_link ? -1 : +1); else if (entry1->sort_priority == entry2->sort_priority) @@ -1335,10 +1443,10 @@ static int compareTreeInfoEntries(const void *object1, const void *object2) free(name1); free(name2); } - else if (LEVELSORTING(entry1) == LEVELSORTING(entry2)) + else if (class_sorting1 == class_sorting2) compare_result = entry1->sort_priority - entry2->sort_priority; else - compare_result = LEVELSORTING(entry1) - LEVELSORTING(entry2); + compare_result = class_sorting1 - class_sorting2; return compare_result; } @@ -1356,8 +1464,8 @@ static void createParentTreeInfoNode(TreeInfo *node_parent) ti_new->node_parent = node_parent; ti_new->parent_link = TRUE; + ti_new->identifier = getStringCopy(node_parent->identifier); ti_new->name = ".. (parent directory)"; - ti_new->name_short = getStringCopy(ti_new->name); ti_new->name_sorting = getStringCopy(ti_new->name); ti_new->filename = ".."; @@ -1419,8 +1527,8 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, DrawInitText(leveldir_new->name, 150, FC_YELLOW); - if (leveldir_new->name_short == NULL) - leveldir_new->name_short = getStringCopy(leveldir_new->name); + if (leveldir_new->identifier == NULL) + leveldir_new->identifier = getStringCopy(leveldir_new->filename); if (leveldir_new->name_sorting == NULL) leveldir_new->name_sorting = getStringCopy(leveldir_new->name); @@ -1637,8 +1745,8 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, DrawInitText(artwork_new->name, 150, FC_YELLOW); #endif - if (artwork_new->name_short == NULL) - artwork_new->name_short = getStringCopy(artwork_new->name); + if (artwork_new->identifier == NULL) + artwork_new->identifier = getStringCopy(artwork_new->filename); if (artwork_new->name_sorting == NULL) artwork_new->name_sorting = getStringCopy(artwork_new->name); @@ -1659,7 +1767,7 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, (artwork_new->basepath == OPTIONS_ARTWORK_DIRECTORY(type) ? FALSE : TRUE); /* (may use ".sort_priority" from "setup_file_list" above) */ - artwork_new->color = LEVELCOLOR(artwork_new); + artwork_new->color = ARTWORKCOLOR(artwork_new); artwork_new->class_desc = getLevelClassDescription(artwork_new); if (setup_file_list == NULL) /* (after determining ".user_defined") */ @@ -1671,22 +1779,25 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, { if (artwork_new->user_defined) { - artwork_new->name = getStringCopy("private"); - artwork_new->sort_priority = LEVELCLASS_USER; + artwork_new->identifier = getStringCopy("private"); + artwork_new->sort_priority = ARTWORKCLASS_USER; } else { - artwork_new->name = getStringCopy("classic"); - artwork_new->sort_priority = LEVELCLASS_CLASSICS; + artwork_new->identifier = getStringCopy("classic"); + artwork_new->sort_priority = ARTWORKCLASS_CLASSICS; } - artwork_new->color = LEVELCOLOR(artwork_new); + /* set to new values after changing ".sort_priority" */ + artwork_new->color = ARTWORKCOLOR(artwork_new); artwork_new->class_desc = getLevelClassDescription(artwork_new); } else - artwork_new->name = getStringCopy(artwork_new->filename); + { + artwork_new->identifier = getStringCopy(artwork_new->filename); + } - artwork_new->name_short = getStringCopy(artwork_new->name); + artwork_new->name = getStringCopy(artwork_new->identifier); artwork_new->name_sorting = getStringCopy(artwork_new->name); } @@ -1765,16 +1876,16 @@ static TreeInfo *getDummyArtworkInfo(int type) setTreeInfoToDefaults(artwork_new, type); - artwork_new->filename = getStringCopy(NOT_AVAILABLE); - artwork_new->fullpath = getStringCopy(NOT_AVAILABLE); - artwork_new->basepath = getStringCopy(NOT_AVAILABLE); + artwork_new->filename = getStringCopy(UNDEFINED_FILENAME); + artwork_new->fullpath = getStringCopy(UNDEFINED_FILENAME); + artwork_new->basepath = getStringCopy(UNDEFINED_FILENAME); if (artwork_new->name != NULL) free(artwork_new->name); - artwork_new->name = getStringCopy(NOT_AVAILABLE); - artwork_new->name_short = getStringCopy(NOT_AVAILABLE); - artwork_new->name_sorting = getStringCopy(NOT_AVAILABLE); + artwork_new->identifier = getStringCopy(UNDEFINED_FILENAME); + artwork_new->name = getStringCopy(UNDEFINED_FILENAME); + artwork_new->name_sorting = getStringCopy(UNDEFINED_FILENAME); return artwork_new; } @@ -1813,28 +1924,28 @@ void LoadArtworkInfo() /* before sorting, the first entries will be from the user directory */ artwork.gfx_current = - getTreeInfoFromFilename(artwork.gfx_first, setup.graphics_set); + getTreeInfoFromIdentifier(artwork.gfx_first, setup.graphics_set); if (artwork.gfx_current == NULL) artwork.gfx_current = getFirstValidTreeInfoEntry(artwork.gfx_first); artwork.snd_current = - getTreeInfoFromFilename(artwork.snd_first, setup.sounds_set); + getTreeInfoFromIdentifier(artwork.snd_first, setup.sounds_set); if (artwork.snd_current == NULL) artwork.snd_current = getFirstValidTreeInfoEntry(artwork.snd_first); artwork.mus_current = - getTreeInfoFromFilename(artwork.mus_first, setup.music_set); + getTreeInfoFromIdentifier(artwork.mus_first, setup.music_set); if (artwork.mus_current == NULL) artwork.mus_current = getFirstValidTreeInfoEntry(artwork.mus_first); - artwork.graphics_set_current_name = artwork.gfx_current->name; - artwork.sounds_set_current_name = artwork.snd_current->name; - artwork.music_set_current_name = artwork.mus_current->name; + artwork.gfx_current_identifier = artwork.gfx_current->identifier; + artwork.snd_current_identifier = artwork.snd_current->identifier; + artwork.mus_current_identifier = artwork.mus_current->identifier; #if 0 - printf("graphics set == %s\n\n", artwork.graphics_set_current_name); - printf("sounds set == %s\n\n", artwork.sounds_set_current_name); - printf("music set == %s\n\n", artwork.music_set_current_name); + 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); #endif sortTreeInfo(&artwork.gfx_first, compareTreeInfoEntries); @@ -1873,13 +1984,13 @@ void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node, if (topnode_last != *artwork_node) { + free((*artwork_node)->identifier); free((*artwork_node)->name); free((*artwork_node)->name_sorting); - free((*artwork_node)->name_short); + (*artwork_node)->identifier = getStringCopy(level_node->filename); (*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)); @@ -1903,6 +2014,31 @@ void LoadLevelArtworkInfo() LoadArtworkInfoFromLevelInfo(&artwork.snd_first, leveldir_first); 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 = getFirstValidTreeInfoEntry(artwork.gfx_first); + } + + if (strcmp(artwork.snd_current_identifier, setup.sounds_set) != 0) + { + artwork.snd_current = + getTreeInfoFromIdentifier(artwork.snd_first, setup.sounds_set); + if (artwork.snd_current == NULL) + artwork.snd_current = getFirstValidTreeInfoEntry(artwork.snd_first); + } + + if (strcmp(artwork.mus_current_identifier, setup.music_set) != 0) + { + artwork.mus_current = + getTreeInfoFromIdentifier(artwork.mus_first, setup.music_set); + if (artwork.mus_current == NULL) + artwork.mus_current = getFirstValidTreeInfoEntry(artwork.mus_first); + } + sortTreeInfo(&artwork.gfx_first, compareTreeInfoEntries); sortTreeInfo(&artwork.snd_first, compareTreeInfoEntries); sortTreeInfo(&artwork.mus_first, compareTreeInfoEntries); @@ -1932,8 +2068,8 @@ static void SaveUserLevelInfo() /* always start with reliable default values */ setTreeInfoToDefaults(&ldi, TREE_TYPE_LEVEL_DIR); - ldi.name = getLoginName(); - ldi.author = getRealName(); + ldi.name = getStringCopy(getLoginName()); + ldi.author = getStringCopy(getRealName()); ldi.levels = 100; ldi.first_level = 1; ldi.sort_priority = LEVELCLASS_USER_START; @@ -1943,7 +2079,7 @@ static void SaveUserLevelInfo() getCookie("LEVELINFO"))); for (i=0; i