X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=32c8f265dfdd84961a1762cfd72f8a7fa7f26962;hb=2c03953e712c427c94c02cdb1e15cd9e99e9e116;hp=d5b2b51dc42303f4acbb24c58ddfb6d72f7025a1;hpb=d6877ad6d36ea50b9ae41afe3586c5b539aa60e4;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index d5b2b51d..32c8f265 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -27,6 +27,9 @@ #define SETUP_FILENAME "setup.conf" #define LEVELSETUP_FILENAME "levelsetup.conf" #define LEVELINFO_FILENAME "levelinfo.conf" +#define GRAPHICSINFO_FILENAME "graphicsinfo.conf" +#define SOUNDSINFO_FILENAME "soundsinfo.conf" +#define MUSICINFO_FILENAME "musicinfo.conf" #define LEVELFILE_EXTENSION "level" #define TAPEFILE_EXTENSION "tape" #define SCOREFILE_EXTENSION "score" @@ -35,6 +38,9 @@ #define SETUP_FILENAME "setup.cnf" #define LEVELSETUP_FILENAME "lvlsetup.cnf" #define LEVELINFO_FILENAME "lvlinfo.cnf" +#define GRAPHICSINFO_FILENAME "gfxinfo.cnf" +#define SOUNDSINFO_FILENAME "sndinfo.cnf" +#define MUSICINFO_FILENAME "musinfo.cnf" #define LEVELFILE_EXTENSION "lvl" #define TAPEFILE_EXTENSION "tap" #define SCOREFILE_EXTENSION "sco" @@ -82,7 +88,7 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] = /* file functions */ /* ------------------------------------------------------------------------- */ -char *getLevelClassDescription(struct LevelDirInfo *ldi) +static char *getLevelClassDescription(TreeInfo *ldi) { int position = ldi->sort_priority / 100; @@ -101,7 +107,7 @@ static char *getUserLevelDir(char *level_subdir) if (userlevel_dir) free(userlevel_dir); - if (strlen(level_subdir) > 0) + if (level_subdir != NULL) userlevel_dir = getPath3(data_dir, userlevel_subdir, level_subdir); else userlevel_dir = getPath2(data_dir, userlevel_subdir); @@ -118,7 +124,7 @@ static char *getTapeDir(char *level_subdir) if (tape_dir) free(tape_dir); - if (strlen(level_subdir) > 0) + if (level_subdir != NULL) tape_dir = getPath3(data_dir, tape_subdir, level_subdir); else tape_dir = getPath2(data_dir, tape_subdir); @@ -135,7 +141,7 @@ static char *getScoreDir(char *level_subdir) if (score_dir) free(score_dir); - if (strlen(level_subdir) > 0) + if (level_subdir != NULL) score_dir = getPath3(data_dir, score_subdir, level_subdir); else score_dir = getPath2(data_dir, score_subdir); @@ -152,7 +158,7 @@ static char *getLevelSetupDir(char *level_subdir) if (levelsetup_dir) free(levelsetup_dir); - if (strlen(level_subdir) > 0) + if (level_subdir != NULL) levelsetup_dir = getPath3(data_dir, levelsetup_subdir, level_subdir); else levelsetup_dir = getPath2(data_dir, levelsetup_subdir); @@ -160,6 +166,98 @@ static char *getLevelSetupDir(char *level_subdir) return levelsetup_dir; } +static char *getCurrentLevelDir() +{ + static char *level_dir = NULL; + + 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); + + return level_dir; +} + +static char *getDefaultGraphicsDir(char *graphics_subdir) +{ + static char *graphics_dir = NULL; + + if (graphics_subdir == NULL) + return options.graphics_directory; + + if (graphics_dir) + free(graphics_dir); + + graphics_dir = getPath2(options.graphics_directory, graphics_subdir); + + return graphics_dir; +} + +static char *getDefaultSoundsDir(char *sounds_subdir) +{ + static char *sounds_dir = NULL; + + if (sounds_subdir == NULL) + return options.sounds_directory; + + if (sounds_dir) + free(sounds_dir); + + sounds_dir = getPath2(options.sounds_directory, sounds_subdir); + + return sounds_dir; +} + +static char *getDefaultMusicDir(char *music_subdir) +{ + static char *music_dir = NULL; + + if (music_subdir == NULL) + return options.music_directory; + + if (music_dir) + free(music_dir); + + music_dir = getPath2(options.music_directory, music_subdir); + + return music_dir; +} + +static char *getUserGraphicsDir() +{ + static char *usergraphics_dir = NULL; + + if (usergraphics_dir == NULL) + usergraphics_dir = getPath2(getUserDataDir(), GRAPHICS_DIRECTORY); + + return usergraphics_dir; +} + +static char *getUserSoundsDir() +{ + static char *usersounds_dir = NULL; + + if (usersounds_dir == NULL) + usersounds_dir = getPath2(getUserDataDir(), SOUNDS_DIRECTORY); + + return usersounds_dir; +} + +static char *getUserMusicDir() +{ + static char *usermusic_dir = NULL; + + if (usermusic_dir == NULL) + usermusic_dir = getPath2(getUserDataDir(), MUSIC_DIRECTORY); + + return usermusic_dir; +} + char *getLevelFilename(int nr) { static char *filename = NULL; @@ -169,11 +267,7 @@ char *getLevelFilename(int nr) free(filename); sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION); - filename = getPath3((leveldir_current->user_defined ? - getUserLevelDir("") : - options.level_directory), - leveldir_current->fullpath, - basename); + filename = getPath2(getCurrentLevelDir(), basename); return filename; } @@ -218,7 +312,19 @@ char *getSetupFilename() return filename; } -static char *getImageBasename(char *basename) +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; @@ -235,28 +341,97 @@ static char *getImageBasename(char *basename) return result; } -char *getImageFilename(char *basename) +static boolean fileExists(char *filename) +{ +#if 0 + printf("checking file '%s'\n", filename); +#endif + + return (access(filename, F_OK) == 0); +} + +char *getCustomImageFilename(char *basename) { static char *filename = NULL; if (filename != NULL) free(filename); - filename = getPath2(options.graphics_directory, getImageBasename(basename)); + basename = getCorrectedImageBasename(basename); - return filename; + /* 1st 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 private artwork directory */ + filename = getPath2(getUserGraphicsDir(), basename); + if (fileExists(filename)) + return filename; + + /* 3rd try: look for special artwork in configured artwork directory */ + filename = getPath2(getSetupArtworkDir(artwork.gfx_current), basename); + if (fileExists(filename)) + return filename; + + /* 4th try: look for default artwork in new default artwork directory */ + filename = getPath2(getDefaultGraphicsDir(GRAPHICS_SUBDIR), basename); + if (fileExists(filename)) + return filename; + + /* 5th try: look for default artwork in old default artwork directory */ + filename = getPath2(options.graphics_directory, basename); + if (fileExists(filename)) + return filename; + + return NULL; /* cannot find image file */ +} + +char *getCustomSoundFilename(char *basename) +{ + static char *filename = NULL; + + if (filename != NULL) + free(filename); + + /* 1st 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 private artwork directory */ + filename = getPath2(getUserSoundsDir(), basename); + if (fileExists(filename)) + return filename; + + /* 3rd try: look for special artwork in configured artwork directory */ + filename = getPath2(getSetupArtworkDir(artwork.snd_current), basename); + if (fileExists(filename)) + return filename; + + /* 4th try: look for default artwork in new default artwork directory */ + filename = getPath2(getDefaultSoundsDir(SOUNDS_SUBDIR), basename); + if (fileExists(filename)) + return filename; + + /* 5th try: look for default artwork in old default artwork directory */ + filename = getPath2(options.sounds_directory, basename); + if (fileExists(filename)) + return filename; + + return NULL; /* cannot find image file */ } void InitTapeDirectory(char *level_subdir) { createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE); - createDirectory(getTapeDir(""), "main tape", PERMS_PRIVATE); + createDirectory(getTapeDir(NULL), "main tape", PERMS_PRIVATE); createDirectory(getTapeDir(level_subdir), "level tape", PERMS_PRIVATE); } void InitScoreDirectory(char *level_subdir) { - createDirectory(getScoreDir(""), "main score", PERMS_PUBLIC); + createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC); createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC); } @@ -267,7 +442,7 @@ void InitUserLevelDirectory(char *level_subdir) if (access(getUserLevelDir(level_subdir), F_OK) != 0) { createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE); - createDirectory(getUserLevelDir(""), "main user level", PERMS_PRIVATE); + createDirectory(getUserLevelDir(NULL), "main user level", PERMS_PRIVATE); createDirectory(getUserLevelDir(level_subdir), "user level",PERMS_PRIVATE); SaveUserLevelInfo(); @@ -277,7 +452,7 @@ void InitUserLevelDirectory(char *level_subdir) void InitLevelSetupDirectory(char *level_subdir) { createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE); - createDirectory(getLevelSetupDir(""), "main level setup", PERMS_PRIVATE); + createDirectory(getLevelSetupDir(NULL), "main level setup", PERMS_PRIVATE); createDirectory(getLevelSetupDir(level_subdir), "level setup",PERMS_PRIVATE); } @@ -330,19 +505,18 @@ void WriteChunk_VERS(FILE *file, int file_version, int game_version) /* some functions to handle lists of level directories */ /* ------------------------------------------------------------------------- */ -struct LevelDirInfo *newLevelDirInfo() +TreeInfo *newTreeInfo() { - return checked_calloc(sizeof(struct LevelDirInfo)); + return checked_calloc(sizeof(TreeInfo)); } -void pushLevelDirInfo(struct LevelDirInfo **node_first, - struct LevelDirInfo *node_new) +void pushTreeInfo(TreeInfo **node_first, TreeInfo *node_new) { node_new->next = *node_first; *node_first = node_new; } -int numLevelDirInfo(struct LevelDirInfo *node) +int numTreeInfo(TreeInfo *node) { int num = 0; @@ -355,52 +529,52 @@ int numLevelDirInfo(struct LevelDirInfo *node) return num; } -boolean validLevelSeries(struct LevelDirInfo *node) +boolean validLevelSeries(TreeInfo *node) { return (node != NULL && !node->node_group && !node->parent_link); } -struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *node) +TreeInfo *getFirstValidTreeInfoEntry(TreeInfo *node) { if (node == NULL) { - if (leveldir_first) /* start with first level directory entry */ - return getFirstValidLevelSeries(leveldir_first); + if (node->node_top) /* start with first tree entry */ + return getFirstValidTreeInfoEntry(*node->node_top); else return NULL; } else if (node->node_group) /* enter level group (step down into tree) */ - return getFirstValidLevelSeries(node->node_group); + return getFirstValidTreeInfoEntry(node->node_group); else if (node->parent_link) /* skip start entry of level group */ { if (node->next) /* get first real level series entry */ - return getFirstValidLevelSeries(node->next); + return getFirstValidTreeInfoEntry(node->next); else /* leave empty level group and go on */ - return getFirstValidLevelSeries(node->node_parent->next); + return getFirstValidTreeInfoEntry(node->node_parent->next); } else /* this seems to be a regular level series */ return node; } -struct LevelDirInfo *getLevelDirInfoFirstGroupEntry(struct LevelDirInfo *node) +TreeInfo *getTreeInfoFirstGroupEntry(TreeInfo *node) { if (node == NULL) return NULL; if (node->node_parent == NULL) /* top level group */ - return leveldir_first; + return *node->node_top; else /* sub level group */ return node->node_parent->node_group; } -int numLevelDirInfoInGroup(struct LevelDirInfo *node) +int numTreeInfoInGroup(TreeInfo *node) { - return numLevelDirInfo(getLevelDirInfoFirstGroupEntry(node)); + return numTreeInfo(getTreeInfoFirstGroupEntry(node)); } -int posLevelDirInfo(struct LevelDirInfo *node) +int posTreeInfo(TreeInfo *node) { - struct LevelDirInfo *node_cmp = getLevelDirInfoFirstGroupEntry(node); + TreeInfo *node_cmp = getTreeInfoFirstGroupEntry(node); int pos = 0; while (node_cmp) @@ -415,9 +589,9 @@ int posLevelDirInfo(struct LevelDirInfo *node) return 0; } -struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *node, int pos) +TreeInfo *getTreeInfoFromPos(TreeInfo *node, int pos) { - struct LevelDirInfo *node_default = node; + TreeInfo *node_default = node; int pos_cmp = 0; while (node) @@ -432,8 +606,7 @@ struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *node, int pos) return node_default; } -struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node, - char *filename) +TreeInfo *getTreeInfoFromFilenameExt(TreeInfo *node, char *filename) { if (filename == NULL) return NULL; @@ -442,9 +615,9 @@ struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node, { if (node->node_group) { - struct LevelDirInfo *node_group; + TreeInfo *node_group; - node_group = getLevelDirInfoFromFilenameExt(node->node_group, filename); + node_group = getTreeInfoFromFilenameExt(node->node_group, filename); if (node_group) return node_group; @@ -461,42 +634,44 @@ struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node, return NULL; } -struct LevelDirInfo *getLevelDirInfoFromFilename(char *filename) +TreeInfo *getTreeInfoFromFilename(TreeInfo *ti, char *filename) { - return getLevelDirInfoFromFilenameExt(leveldir_first, filename); + return getTreeInfoFromFilenameExt(ti, filename); } -void dumpLevelDirInfo(struct LevelDirInfo *node, int depth) +void dumpTreeInfo(TreeInfo *node, int depth) { int i; + printf("Dumping TreeInfo:\n"); + while (node) { - for (i=0; ifilename); + printf("filename == '%s' [%s]\n", node->filename, node->name); if (node->node_group != NULL) - dumpLevelDirInfo(node->node_group, depth + 1); + dumpTreeInfo(node->node_group, depth + 1); node = node->next; } } -void sortLevelDirInfo(struct LevelDirInfo **node_first, - int (*compare_function)(const void *, const void *)) +void sortTreeInfo(TreeInfo **node_first, + int (*compare_function)(const void *, const void *)) { - int num_nodes = numLevelDirInfo(*node_first); - struct LevelDirInfo **sort_array; - struct LevelDirInfo *node = *node_first; + int num_nodes = numTreeInfo(*node_first); + TreeInfo **sort_array; + TreeInfo *node = *node_first; int i = 0; if (num_nodes == 0) return; /* allocate array for sorting structure pointers */ - sort_array = checked_calloc(num_nodes * sizeof(struct LevelDirInfo *)); + sort_array = checked_calloc(num_nodes * sizeof(TreeInfo *)); /* writing structure pointers to sorting array */ while (i < num_nodes && node) /* double boundary check... */ @@ -508,7 +683,7 @@ void sortLevelDirInfo(struct LevelDirInfo **node_first, } /* sorting the structure pointers in the sorting array */ - qsort(sort_array, num_nodes, sizeof(struct LevelDirInfo *), + qsort(sort_array, num_nodes, sizeof(TreeInfo *), compare_function); /* update the linkage of list elements with the sorted node array */ @@ -526,7 +701,7 @@ void sortLevelDirInfo(struct LevelDirInfo **node_first, while (node) { if (node->node_group != NULL) - sortLevelDirInfo(&node->node_group, compare_function); + sortTreeInfo(&node->node_group, compare_function); node = node->next; } @@ -984,25 +1159,40 @@ void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, #define NUM_LEVELINFO_TOKENS 10 -static struct LevelDirInfo ldi; +static LevelDirTree ldi; static struct TokenInfo levelinfo_tokens[] = { /* level directory info */ - { 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" }, - { TYPE_INTEGER, &ldi.levels, "levels" }, - { 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_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" }, + { TYPE_INTEGER, &ldi.levels, "levels" }, + { 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" } }; -static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi) +static void setTreeInfoToDefaults(TreeInfo *ldi, int type) { + ldi->type = type; + + ldi->node_top = (ldi->type == TREE_TYPE_LEVEL_DIR ? &leveldir_first : + ldi->type == TREE_TYPE_GRAPHICS_DIR ? &artwork.gfx_first : + ldi->type == TREE_TYPE_SOUNDS_DIR ? &artwork.snd_first : + ldi->type == TREE_TYPE_MUSIC_DIR ? &artwork.mus_first : + NULL); + + ldi->node_parent = NULL; + ldi->node_group = NULL; + ldi->next = NULL; + + ldi->cl_first = -1; + ldi->cl_cursor = -1; + ldi->filename = NULL; ldi->fullpath = NULL; ldi->basepath = NULL; @@ -1010,32 +1200,32 @@ static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi) ldi->name_short = NULL; ldi->name_sorting = NULL; ldi->author = getStringCopy(ANONYMOUS_NAME); - ldi->imported_from = NULL; - ldi->levels = 0; - ldi->first_level = 0; - ldi->last_level = 0; + ldi->sort_priority = LEVELCLASS_UNDEFINED; /* default: least priority */ - ldi->level_group = FALSE; ldi->parent_link = FALSE; ldi->user_defined = FALSE; - ldi->readonly = TRUE; ldi->color = 0; ldi->class_desc = NULL; - ldi->handicap_level = 0; - ldi->cl_first = -1; - ldi->cl_cursor = -1; - ldi->node_parent = NULL; - ldi->node_group = NULL; - ldi->next = NULL; + if (ldi->type == TREE_TYPE_LEVEL_DIR) + { + ldi->imported_from = NULL; + ldi->levels = 0; + ldi->first_level = 0; + ldi->last_level = 0; + ldi->level_group = FALSE; + ldi->handicap_level = 0; + ldi->readonly = TRUE; + } } -static void setLevelDirInfoToDefaultsFromParent(struct LevelDirInfo *ldi, - struct LevelDirInfo *parent) +static void setTreeInfoToDefaultsFromParent(TreeInfo *ldi, TreeInfo *parent) { if (parent == NULL) { - setLevelDirInfoToDefaults(ldi); + Error(ERR_WARN, "setTreeInfoToDefaultsFromParent(): parent == NULL"); + + setTreeInfoToDefaults(ldi, TREE_TYPE_GENERIC); return; } @@ -1061,6 +1251,7 @@ static void setLevelDirInfoToDefaultsFromParent(struct LevelDirInfo *ldi, ldi->level_group = FALSE; ldi->parent_link = FALSE; + ldi->node_top = parent->node_top; ldi->node_parent = parent; ldi->node_group = NULL; ldi->next = NULL; @@ -1084,6 +1275,10 @@ void setSetupInfo(struct TokenInfo *token_info, break; case TYPE_KEY: + *(Key *)setup_value = getKeyFromKeyName(token_value); + break; + + case TYPE_KEY_X11: *(Key *)setup_value = getKeyFromX11KeyName(token_value); break; @@ -1102,10 +1297,10 @@ void setSetupInfo(struct TokenInfo *token_info, } } -static int compareLevelDirInfoEntries(const void *object1, const void *object2) +static int compareTreeInfoEntries(const void *object1, const void *object2) { - const struct LevelDirInfo *entry1 = *((struct LevelDirInfo **)object1); - const struct LevelDirInfo *entry2 = *((struct LevelDirInfo **)object2); + const TreeInfo *entry1 = *((TreeInfo **)object1); + const TreeInfo *entry2 = *((TreeInfo **)object2); int compare_result; if (entry1->parent_link || entry2->parent_link) @@ -1128,42 +1323,44 @@ static int compareLevelDirInfoEntries(const void *object1, const void *object2) return compare_result; } -static void createParentLevelDirNode(struct LevelDirInfo *node_parent) +static void createParentTreeInfoNode(TreeInfo *node_parent) { - struct LevelDirInfo *leveldir_new = newLevelDirInfo(); + TreeInfo *ti_new; + + if (node_parent == NULL) + return; - setLevelDirInfoToDefaults(leveldir_new); + ti_new = newTreeInfo(); + setTreeInfoToDefaults(ti_new, node_parent->type); - leveldir_new->node_parent = node_parent; - leveldir_new->parent_link = TRUE; + ti_new->node_parent = node_parent; + ti_new->parent_link = TRUE; - leveldir_new->name = ".. (parent directory)"; - leveldir_new->name_short = getStringCopy(leveldir_new->name); - leveldir_new->name_sorting = getStringCopy(leveldir_new->name); + ti_new->name = ".. (parent directory)"; + ti_new->name_short = getStringCopy(ti_new->name); + ti_new->name_sorting = getStringCopy(ti_new->name); - leveldir_new->filename = ".."; - leveldir_new->fullpath = getStringCopy(node_parent->fullpath); + ti_new->filename = ".."; + ti_new->fullpath = getStringCopy(node_parent->fullpath); - leveldir_new->sort_priority = node_parent->sort_priority; - leveldir_new->class_desc = getLevelClassDescription(leveldir_new); + ti_new->sort_priority = node_parent->sort_priority; + ti_new->class_desc = getLevelClassDescription(ti_new); - pushLevelDirInfo(&node_parent->node_group, leveldir_new); + pushTreeInfo(&node_parent->node_group, ti_new); } -/* forward declaration for recursive call by "LoadLevelInfoFromSetupFile()" */ -static void LoadLevelInfoFromLevelGroupDir(struct LevelDirInfo **, - struct LevelDirInfo *, - char *); +/* forward declaration for recursive call by "LoadLevelInfoFromLevelDir()" */ +static void LoadLevelInfoFromLevelDir(TreeInfo **, TreeInfo *, char *); -static boolean LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first, - struct LevelDirInfo *node_parent, - char *level_directory, - char *directory_name) +static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, + TreeInfo *node_parent, + char *level_directory, + char *directory_name) { char *directory_path = getPath2(level_directory, directory_name); char *filename = getPath2(directory_path, LEVELINFO_FILENAME); struct SetupFileList *setup_file_list = loadSetupFileList(filename); - struct LevelDirInfo *leveldir_new = NULL; + LevelDirTree *leveldir_new = NULL; int i; if (setup_file_list == NULL) @@ -1176,10 +1373,14 @@ static boolean LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first, return FALSE; } - leveldir_new = newLevelDirInfo(); + leveldir_new = newTreeInfo(); + + if (node_parent) + setTreeInfoToDefaultsFromParent(leveldir_new, node_parent); + else + setTreeInfoToDefaults(leveldir_new, TREE_TYPE_LEVEL_DIR); checkSetupFileListIdentifier(setup_file_list, getCookie("LEVELINFO")); - setLevelDirInfoToDefaultsFromParent(leveldir_new, node_parent); /* set all structure fields according to the token/value pairs */ ldi = *leveldir_new; @@ -1206,8 +1407,7 @@ static boolean LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first, else /* sub level group */ { leveldir_new->basepath = node_parent->basepath; - leveldir_new->fullpath = getPath2(node_parent->fullpath, - directory_name); + leveldir_new->fullpath = getPath2(node_parent->fullpath, directory_name); } if (leveldir_new->levels < 1) @@ -1227,18 +1427,18 @@ static boolean LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first, leveldir_new->last_level : leveldir_new->first_level); - pushLevelDirInfo(node_first, leveldir_new); + pushTreeInfo(node_first, leveldir_new); freeSetupFileList(setup_file_list); if (leveldir_new->level_group) { /* create node to link back to current level directory */ - createParentLevelDirNode(leveldir_new); + createParentTreeInfoNode(leveldir_new); /* step into sub-directory and look for more level series */ - LoadLevelInfoFromLevelGroupDir(&leveldir_new->node_group, - leveldir_new, directory_path); + LoadLevelInfoFromLevelDir(&leveldir_new->node_group, + leveldir_new, directory_path); } free(directory_path); @@ -1247,9 +1447,9 @@ static boolean LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first, return TRUE; } -static void LoadLevelInfoFromLevelGroupDir(struct LevelDirInfo **node_first, - struct LevelDirInfo *node_parent, - char *level_directory) +static void LoadLevelInfoFromLevelDir(TreeInfo **node_first, + TreeInfo *node_parent, + char *level_directory) { DIR *dir; struct dirent *dir_entry; @@ -1285,9 +1485,9 @@ static void LoadLevelInfoFromLevelGroupDir(struct LevelDirInfo **node_first, free(directory_path); - valid_entry_found |= LoadLevelInfoFromLevelDir(node_first, node_parent, - level_directory, - directory_name); + valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent, + level_directory, + directory_name); } closedir(dir); @@ -1295,8 +1495,8 @@ static void LoadLevelInfoFromLevelGroupDir(struct LevelDirInfo **node_first, if (!valid_entry_found) { /* check if this directory directly contains a file "levelinfo.conf" */ - valid_entry_found |= LoadLevelInfoFromLevelDir(node_first, node_parent, - level_directory, "."); + valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent, + level_directory, "."); } if (!valid_entry_found) @@ -1310,19 +1510,272 @@ void LoadLevelInfo() DrawInitText("Loading level series:", 120, FC_GREEN); - /* check if this directory directly contains a file "levelinfo.conf" */ - LoadLevelInfoFromLevelGroupDir(&leveldir_first,NULL,options.level_directory); - LoadLevelInfoFromLevelGroupDir(&leveldir_first,NULL,getUserLevelDir("")); + LoadLevelInfoFromLevelDir(&leveldir_first, NULL, options.level_directory); + LoadLevelInfoFromLevelDir(&leveldir_first, NULL, getUserLevelDir(NULL)); - leveldir_current = getFirstValidLevelSeries(leveldir_first); + /* before sorting, the first entries will be from the user directory */ + leveldir_current = getFirstValidTreeInfoEntry(leveldir_first); if (leveldir_first == NULL) Error(ERR_EXIT, "cannot find any valid level series in any directory"); - sortLevelDirInfo(&leveldir_first, compareLevelDirInfoEntries); + sortTreeInfo(&leveldir_first, compareTreeInfoEntries); #if 0 - dumpLevelDirInfo(leveldir_first, 0); + dumpTreeInfo(leveldir_first, 0); +#endif +} + +static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, + TreeInfo *node_parent, + char *base_directory, + 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 : "")); + 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); + + if (setup_file_list == NULL) /* no config file -- look for artwork files */ + { + DIR *dir; + struct dirent *dir_entry; + boolean valid_file_found = FALSE; + + if ((dir = opendir(directory_path)) != NULL) + { + while ((dir_entry = readdir(dir)) != NULL) + { + 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))) + { + valid_file_found = TRUE; + break; + } + } + + closedir(dir); + } + + if (!valid_file_found) + { + if (options.debug) + Error(ERR_WARN, "ignoring artwork directory '%s'", base_directory); + + free(directory_path); + free(filename); + + return FALSE; + } + } + + artwork_new = newTreeInfo(); + + if (node_parent) + setTreeInfoToDefaultsFromParent(artwork_new, node_parent); + else + setTreeInfoToDefaults(artwork_new, type); + + artwork_new->filename = getStringCopy(directory_name); + + if (setup_file_list) /* (before defining ".color" and ".class_desc") */ + { +#if 0 + checkSetupFileListIdentifier(setup_file_list, getCookie("...")); +#endif + + /* set all structure fields according to the token/value pairs */ + ldi = *artwork_new; + for (i=0; iname, 150, FC_YELLOW); + + if (artwork_new->name_short == NULL) + artwork_new->name_short = getStringCopy(artwork_new->name); + + if (artwork_new->name_sorting == NULL) + artwork_new->name_sorting = getStringCopy(artwork_new->name); + } + + if (node_parent == NULL) /* top level group */ + { + artwork_new->basepath = base_directory; + artwork_new->fullpath = artwork_new->filename; + } + else /* sub level group */ + { + artwork_new->basepath = node_parent->basepath; + 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); + + /* (may use ".sort_priority" from "setup_file_list" above) */ + artwork_new->color = LEVELCOLOR(artwork_new); + artwork_new->class_desc = getLevelClassDescription(artwork_new); + + if (setup_file_list == NULL) /* (after determining ".user_defined") */ + { + if (artwork_new->name != NULL) + free(artwork_new->name); + + if (strcmp(artwork_new->filename, ".") == 0) + { + if (artwork_new->user_defined) + artwork_new->name = getStringCopy("private"); + else + artwork_new->name = getStringCopy("default"); + } + else + artwork_new->name = getStringCopy(artwork_new->filename); + + artwork_new->name_short = getStringCopy(artwork_new->name); + artwork_new->name_sorting = getStringCopy(artwork_new->name); + } + + pushTreeInfo(node_first, artwork_new); + + freeSetupFileList(setup_file_list); + + free(directory_path); + free(filename); + + return TRUE; +} + +static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first, + TreeInfo *node_parent, + char *base_directory, int type) +{ + DIR *dir; + struct dirent *dir_entry; + boolean valid_entry_found = FALSE; + + 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)) + Error(ERR_WARN, "cannot read directory '%s'", base_directory); + return; + } + + while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ + { + struct stat file_status; + char *directory_name = dir_entry->d_name; + char *directory_path = getPath2(base_directory, directory_name); + + /* skip entries for current and parent directory */ + if (strcmp(directory_name, ".") == 0 || + strcmp(directory_name, "..") == 0) + { + 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 */ + { + free(directory_path); + continue; + } + + free(directory_path); + + /* check if this directory contains artwork with or without config file */ + valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first,node_parent, + base_directory, + directory_name, type); + } + + closedir(dir); + + /* check if this directory directly contains artwork itself */ + valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first,node_parent, + base_directory, ".", + type); + if (!valid_entry_found) + Error(ERR_WARN, "cannot find any valid artwork in directory '%s'", + base_directory); +} + +void LoadArtworkInfo() +{ + DrawInitText("Looking for custom artwork:", 120, FC_GREEN); + + LoadArtworkInfoFromArtworkDir(&artwork.gfx_first, NULL, + options.graphics_directory, + TREE_TYPE_GRAPHICS_DIR); + LoadArtworkInfoFromArtworkDir(&artwork.gfx_first, NULL, + getUserGraphicsDir(), + TREE_TYPE_GRAPHICS_DIR); + + LoadArtworkInfoFromArtworkDir(&artwork.snd_first, NULL, + options.sounds_directory, + TREE_TYPE_SOUNDS_DIR); + LoadArtworkInfoFromArtworkDir(&artwork.snd_first, NULL, + getUserSoundsDir(), + TREE_TYPE_SOUNDS_DIR); + + LoadArtworkInfoFromArtworkDir(&artwork.mus_first, NULL, + options.music_directory, + TREE_TYPE_MUSIC_DIR); + LoadArtworkInfoFromArtworkDir(&artwork.mus_first, NULL, + getUserMusicDir(), + TREE_TYPE_MUSIC_DIR); + + /* before sorting, the first entries will be from the user directory */ + artwork.gfx_current = + getTreeInfoFromFilename(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); + if (artwork.snd_current == NULL) + artwork.snd_current = getFirstValidTreeInfoEntry(artwork.snd_first); + + artwork.mus_current = + getTreeInfoFromFilename(artwork.mus_first, setup.music_set); + if (artwork.mus_current == NULL) + artwork.mus_current = getFirstValidTreeInfoEntry(artwork.mus_first); + + artwork.graphics_set_current = artwork.gfx_current->name; + artwork.sounds_set_current = artwork.snd_current->name; + artwork.music_set_current = artwork.mus_current->name; + + sortTreeInfo(&artwork.gfx_first, compareTreeInfoEntries); + sortTreeInfo(&artwork.snd_first, compareTreeInfoEntries); + sortTreeInfo(&artwork.mus_first, compareTreeInfoEntries); + +#if 0 + dumpTreeInfo(artwork.gfx_first, 0); + dumpTreeInfo(artwork.snd_first, 0); + dumpTreeInfo(artwork.mus_first, 0); #endif } @@ -1342,7 +1795,7 @@ static void SaveUserLevelInfo() } /* always start with reliable default values */ - setLevelDirInfoToDefaults(&ldi); + setTreeInfoToDefaults(&ldi, TREE_TYPE_LEVEL_DIR); ldi.name = getLoginName(); ldi.author = getRealName(); @@ -1366,66 +1819,82 @@ static void SaveUserLevelInfo() SetFilePermissions(filename, PERMS_PRIVATE); } -char *getSetupLine(struct TokenInfo *token_info, char *prefix, int token_nr) +char *getSetupValue(int type, void *value) { - int i; - static char entry[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; + static char value_string[MAX_LINE_LEN]; - /* start with the prefix, token and some spaces to format output line */ - sprintf(entry, "%s%s:", prefix, token_text); - for (i=strlen(entry); i/levelsetup.conf */ @@ -1448,9 +1917,10 @@ void LoadLevelSetup_LastSeries() char *last_level_series = getTokenValue(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES); - leveldir_current = getLevelDirInfoFromFilename(last_level_series); + leveldir_current = getTreeInfoFromFilename(leveldir_first, + last_level_series); if (leveldir_current == NULL) - leveldir_current = leveldir_first; + leveldir_current = getFirstValidTreeInfoEntry(leveldir_first); checkSetupFileListIdentifier(level_setup_list, getCookie("LEVELSETUP")); @@ -1503,7 +1973,7 @@ static void checkSeriesInfo() /* check for more levels besides the 'levels' field of 'levelinfo.conf' */ level_directory = getPath2((leveldir_current->user_defined ? - getUserLevelDir("") : + getUserLevelDir(NULL) : options.level_directory), leveldir_current->fullpath);