X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=6f8ffaca24695f5a1d8795bb8ba7339f5b602a42;hb=b640b9d7647df4cbba0e530f6f4bcece384048e4;hp=dc01ad4c9ecdbdcbffec3c9cf9a7117909d9877b;hpb=201eaae5ae325e0c99e43ab240163a99dc5c0db9;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index dc01ad4c..6f8ffaca 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -41,10 +41,11 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] = #define LEVELCOLOR(n) (IS_LEVELCLASS_TUTORIAL(n) ? FC_BLUE : \ IS_LEVELCLASS_CLASSICS(n) ? FC_RED : \ - IS_LEVELCLASS_BD(n) ? FC_GREEN : \ + IS_LEVELCLASS_BD(n) ? FC_YELLOW : \ IS_LEVELCLASS_EM(n) ? FC_YELLOW : \ - IS_LEVELCLASS_SP(n) ? FC_GREEN : \ + IS_LEVELCLASS_SP(n) ? FC_YELLOW : \ IS_LEVELCLASS_DX(n) ? FC_YELLOW : \ + IS_LEVELCLASS_SB(n) ? FC_YELLOW : \ IS_LEVELCLASS_CONTRIB(n) ? FC_GREEN : \ IS_LEVELCLASS_PRIVATE(n) ? FC_RED : \ FC_BLUE) @@ -55,14 +56,15 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] = IS_LEVELCLASS_EM(n) ? 3 : \ IS_LEVELCLASS_SP(n) ? 4 : \ IS_LEVELCLASS_DX(n) ? 5 : \ - IS_LEVELCLASS_CONTRIB(n) ? 6 : \ - IS_LEVELCLASS_PRIVATE(n) ? 7 : \ + IS_LEVELCLASS_SB(n) ? 6 : \ + IS_LEVELCLASS_CONTRIB(n) ? 7 : \ + IS_LEVELCLASS_PRIVATE(n) ? 8 : \ 9) #define ARTWORKCOLOR(n) (IS_ARTWORKCLASS_CLASSICS(n) ? FC_RED : \ - IS_ARTWORKCLASS_CONTRIB(n) ? FC_YELLOW : \ + IS_ARTWORKCLASS_CONTRIB(n) ? FC_GREEN : \ IS_ARTWORKCLASS_PRIVATE(n) ? FC_RED : \ - IS_ARTWORKCLASS_LEVEL(n) ? FC_GREEN : \ + IS_ARTWORKCLASS_LEVEL(n) ? FC_YELLOW : \ FC_BLUE) #define ARTWORKSORTING(n) (IS_ARTWORKCLASS_CLASSICS(n) ? 0 : \ @@ -71,10 +73,14 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] = IS_ARTWORKCLASS_PRIVATE(n) ? 3 : \ 9) -#define TOKEN_VALUE_POSITION 40 -#define TOKEN_COMMENT_POSITION 60 +#define TOKEN_VALUE_POSITION_SHORT 32 +#define TOKEN_VALUE_POSITION_DEFAULT 40 +#define TOKEN_COMMENT_POSITION_DEFAULT 60 -#define MAX_COOKIE_LEN 256 +#define MAX_COOKIE_LEN 256 + +static int token_value_position = TOKEN_VALUE_POSITION_DEFAULT; +static int token_comment_position = TOKEN_COMMENT_POSITION_DEFAULT; /* ------------------------------------------------------------------------- */ @@ -148,7 +154,7 @@ static char *getLevelDirFromTreeInfo(TreeInfo *node) checked_free(level_dir); - level_dir = getPath2((node->user_defined ? getUserLevelDir(NULL) : + level_dir = getPath2((node->in_user_dir ? getUserLevelDir(NULL) : options.level_directory), node->fullpath); return level_dir; @@ -296,8 +302,8 @@ char *setLevelArtworkDir(TreeInfo *ti) if (ti == NULL || leveldir_current == NULL) return NULL; - artwork_path_ptr = &(LEVELDIR_ARTWORK_PATH(leveldir_current, ti->type)); - artwork_set_ptr = &(LEVELDIR_ARTWORK_SET( leveldir_current, ti->type)); + artwork_path_ptr = LEVELDIR_ARTWORK_PATH_PTR(leveldir_current, ti->type); + artwork_set_ptr = LEVELDIR_ARTWORK_SET_PTR( leveldir_current, ti->type); checked_free(*artwork_path_ptr); @@ -404,7 +410,12 @@ char *getEditorSetupFilename() static char *filename = NULL; checked_free(filename); + filename = getPath2(getCurrentLevelDir(), EDITORSETUP_FILENAME); + if (fileExists(filename)) + return filename; + + checked_free(filename); filename = getPath2(getSetupDir(), EDITORSETUP_FILENAME); return filename; @@ -438,8 +449,8 @@ char *getLevelSetInfoFilename() char *basenames[] = { "README", - "README.txt", "README.TXT", + "README.txt", "Readme", "Readme.txt", "readme", @@ -452,8 +463,8 @@ char *getLevelSetInfoFilename() for (i = 0; basenames[i] != NULL; i++) { checked_free(filename); - filename = getPath2(getCurrentLevelDir(), basenames[i]); + if (fileExists(filename)) return filename; } @@ -504,6 +515,22 @@ char *getCustomImageFilename(char *basename) if (!setup.override_level_graphics) { +#if 1 + /* try special ECS graphics */ + filename = getPath3(getCurrentLevelDir(), GRAPHICS_ECS_DIRECTORY, basename); + if (fileExists(filename) && !setup.prefer_aga_graphics) + return filename; + + free(filename); + + /* try special AGA graphics */ + filename = getPath3(getCurrentLevelDir(), GRAPHICS_AGA_DIRECTORY, basename); + if (fileExists(filename) && setup.prefer_aga_graphics) + return filename; + + free(filename); +#endif + /* 1st try: look for special artwork in current level series directory */ filename = getPath3(getCurrentLevelDir(), GRAPHICS_DIRECTORY, basename); if (fileExists(filename)) @@ -511,9 +538,22 @@ char *getCustomImageFilename(char *basename) free(filename); +#if 1 + if (leveldir_current) + printf("::: A -> '%s' [%s]\n", leveldir_current->graphics_set, + leveldir_current->subdir); +#endif + /* check if there is special artwork configured in level series config */ if (getLevelArtworkSet(ARTWORK_TYPE_GRAPHICS) != NULL) { +#if 1 + printf("::: B -> '%s' ---------> '%s'\n", + getLevelArtworkSet(ARTWORK_TYPE_GRAPHICS), + leveldir_current->graphics_path); + /* -> getLevelArtworkDir(ARTWORK_TYPE_GRAPHICS)); */ +#endif + /* 2nd try: look for special artwork configured in level series config */ filename = getPath2(getLevelArtworkDir(ARTWORK_TYPE_GRAPHICS), basename); if (fileExists(filename)) @@ -769,7 +809,7 @@ static void SaveUserLevelInfo(); void InitUserLevelDirectory(char *level_subdir) { - if (access(getUserLevelDir(level_subdir), F_OK) != 0) + if (!fileExists(getUserLevelDir(level_subdir))) { createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE); createDirectory(getUserLevelDir(NULL), "main user level", PERMS_PRIVATE); @@ -788,7 +828,7 @@ void InitLevelSetupDirectory(char *level_subdir) /* ------------------------------------------------------------------------- */ -/* some functions to handle lists of level directories */ +/* some functions to handle lists of level and artwork directories */ /* ------------------------------------------------------------------------- */ TreeInfo *newTreeInfo() @@ -916,6 +956,95 @@ TreeInfo *getTreeInfoFromIdentifier(TreeInfo *node, char *identifier) return NULL; } +TreeInfo *cloneTreeNode(TreeInfo **node_top, TreeInfo *node_parent, + TreeInfo *node, boolean skip_sets_without_levels) +{ + TreeInfo *node_new; + + if (node == NULL) + return NULL; + + if (!node->parent_link && !node->level_group && + skip_sets_without_levels && node->levels == 0) + return cloneTreeNode(node_top, node_parent, node->next, + skip_sets_without_levels); + + node_new = newTreeInfo(); + + *node_new = *node; /* copy complete node */ + + node_new->node_top = node_top; /* correct top node link */ + node_new->node_parent = node_parent; /* correct parent node link */ + + if (node->level_group) + node_new->node_group = cloneTreeNode(node_top, node_new, node->node_group, + skip_sets_without_levels); + + node_new->next = cloneTreeNode(node_top, node_parent, node->next, + skip_sets_without_levels); + + return node_new; +} + +void cloneTree(TreeInfo **ti_new, TreeInfo *ti, boolean skip_empty_sets) +{ + TreeInfo *ti_cloned = cloneTreeNode(ti_new, NULL, ti, skip_empty_sets); + + *ti_new = ti_cloned; +} + +static boolean adjustTreeGraphics(TreeInfo *node) +{ + boolean settings_changed = FALSE; + + while (node) + { +#if 1 + if (node->graphics_ecs_set && !setup.prefer_aga_graphics) + { + setString(&node->graphics_set, node->graphics_ecs_set); +#if 0 + printf("::: setting graphics for set '%s' to '%s' [ECS]\n", + node->subdir, node->graphics_set); +#endif + + settings_changed = TRUE; + } + else if (node->graphics_aga_set && setup.prefer_aga_graphics) + { + setString(&node->graphics_set, node->graphics_aga_set); +#if 0 + printf("::: setting graphics for set '%s' to '%s' [AGA]\n", + node->subdir, node->graphics_set); +#endif + + settings_changed = TRUE; + } + else if (node->graphics_set == NULL) + { +#if 0 + printf("::: cannot set graphics_set for set '%s'\n", node->subdir); +#endif + } +#else + if (node->graphics_ecs_set) + printf("::: SET '%s': found ECS set '%s'\n", + node->subdir, node->graphics_ecs_set); + + if (node->graphics_aga_set) + printf("::: SET '%s': found AGA set '%s'\n", + node->subdir, node->graphics_aga_set); +#endif + + if (node->node_group != NULL) + settings_changed |= adjustTreeGraphics(node->node_group); + + node = node->next; + } + + return settings_changed; +} + void dumpTreeInfo(TreeInfo *node, int depth) { int i; @@ -927,13 +1056,8 @@ void dumpTreeInfo(TreeInfo *node, int depth) for (i = 0; i < (depth + 1) * 3; i++) printf(" "); -#if 1 printf("subdir == '%s' ['%s', '%s'] [%d])\n", - node->subdir, node->fullpath, node->basepath, node->user_defined); -#else - printf("subdir == '%s' (%s) [%s] (%d)\n", - node->subdir, node->name, node->identifier, node->sort_priority); -#endif + node->subdir, node->fullpath, node->basepath, node->in_user_dir); if (node->node_group != NULL) dumpTreeInfo(node->node_group, depth + 1); @@ -1103,7 +1227,7 @@ void createDirectory(char *dir, char *text, int permission_class) mode_t group_umask = ~(dir_mode & S_IRWXG); posix_umask(normal_umask & group_umask); - if (access(dir, F_OK) != 0) + if (!fileExists(dir)) if (posix_mkdir(dir, dir_mode) != 0) Error(ERR_WARN, "cannot create %s directory '%s'", text, dir); @@ -1198,7 +1322,7 @@ char *getFormattedSetupEntry(char *token, char *value) /* start with the token and some spaces to format output line */ sprintf(entry, "%s:", token); - for (i = strlen(entry); i < TOKEN_VALUE_POSITION; i++) + for (i = strlen(entry); i < token_value_position; i++) strcat(entry, " "); /* continue with the token's value */ @@ -1385,7 +1509,6 @@ char *removeHashEntry(SetupFileHash *hash, char *token) } #if 0 -#ifdef DEBUG static void printSetupFileHash(SetupFileHash *hash) { BEGIN_HASH_ITERATION(hash, itr) @@ -1396,7 +1519,6 @@ static void printSetupFileHash(SetupFileHash *hash) END_HASH_ITERATION(hash, itr) } #endif -#endif static void *loadSetupFileData(char *filename, boolean use_hash) { @@ -1406,17 +1528,18 @@ static void *loadSetupFileData(char *filename, boolean use_hash) boolean read_continued_line = FALSE; FILE *file; - if (use_hash) - setup_file_data = newSetupFileHash(); - else - insert_ptr = setup_file_data = newSetupFileList("", ""); - if (!(file = fopen(filename, MODE_READ))) { Error(ERR_WARN, "cannot open configuration file '%s'", filename); + return NULL; } + if (use_hash) + setup_file_data = newSetupFileHash(); + else + insert_ptr = setup_file_data = newSetupFileList("", ""); + while (!feof(file)) { /* read next line of input file */ @@ -1548,14 +1671,14 @@ SetupFileHash *loadSetupFileHash(char *filename) } void checkSetupFileHashIdentifier(SetupFileHash *setup_file_hash, - char *identifier) + char *filename, char *identifier) { char *value = getHashEntry(setup_file_hash, TOKEN_STR_FILE_IDENTIFIER); if (value == NULL) - Error(ERR_WARN, "configuration file has no file identifier"); + Error(ERR_WARN, "config file '%s' has no file identifier", filename); else if (!checkCookieString(value, identifier)) - Error(ERR_WARN, "configuration file has wrong file identifier"); + Error(ERR_WARN, "config file '%s' has wrong file identifier", filename); } @@ -1563,53 +1686,61 @@ void checkSetupFileHashIdentifier(SetupFileHash *setup_file_hash, /* setup file stuff */ /* ========================================================================= */ -#define TOKEN_STR_LAST_LEVEL_SERIES "last_level_series" -#define TOKEN_STR_LAST_PLAYED_LEVEL "last_played_level" -#define TOKEN_STR_HANDICAP_LEVEL "handicap_level" +#define TOKEN_STR_LAST_LEVEL_SERIES "last_level_series" +#define TOKEN_STR_LAST_PLAYED_LEVEL "last_played_level" +#define TOKEN_STR_HANDICAP_LEVEL "handicap_level" /* level directory info */ -#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 -#define LEVELINFO_TOKEN_LEVELS 5 -#define LEVELINFO_TOKEN_FIRST_LEVEL 6 -#define LEVELINFO_TOKEN_SORT_PRIORITY 7 -#define LEVELINFO_TOKEN_LATEST_ENGINE 8 -#define LEVELINFO_TOKEN_LEVEL_GROUP 9 -#define LEVELINFO_TOKEN_READONLY 10 -#define LEVELINFO_TOKEN_GRAPHICS_SET 11 -#define LEVELINFO_TOKEN_SOUNDS_SET 12 -#define LEVELINFO_TOKEN_MUSIC_SET 13 -#define LEVELINFO_TOKEN_FILENAME 14 -#define LEVELINFO_TOKEN_FILETYPE 15 -#define LEVELINFO_TOKEN_HANDICAP 16 - -#define NUM_LEVELINFO_TOKENS 17 +#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 +#define LEVELINFO_TOKEN_IMPORTED_BY 5 +#define LEVELINFO_TOKEN_LEVELS 6 +#define LEVELINFO_TOKEN_FIRST_LEVEL 7 +#define LEVELINFO_TOKEN_SORT_PRIORITY 8 +#define LEVELINFO_TOKEN_LATEST_ENGINE 9 +#define LEVELINFO_TOKEN_LEVEL_GROUP 10 +#define LEVELINFO_TOKEN_READONLY 11 +#define LEVELINFO_TOKEN_GRAPHICS_ECS_SET 12 +#define LEVELINFO_TOKEN_GRAPHICS_AGA_SET 13 +#define LEVELINFO_TOKEN_GRAPHICS_SET 14 +#define LEVELINFO_TOKEN_SOUNDS_SET 15 +#define LEVELINFO_TOKEN_MUSIC_SET 16 +#define LEVELINFO_TOKEN_FILENAME 17 +#define LEVELINFO_TOKEN_FILETYPE 18 +#define LEVELINFO_TOKEN_HANDICAP 19 +#define LEVELINFO_TOKEN_SKIP_LEVELS 20 + +#define NUM_LEVELINFO_TOKENS 21 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_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.latest_engine, "latest_engine" }, - { TYPE_BOOLEAN, &ldi.level_group, "level_group" }, - { 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" }, - { TYPE_STRING, &ldi.level_filename, "filename" }, - { TYPE_STRING, &ldi.level_filetype, "filetype" }, - { TYPE_BOOLEAN, &ldi.handicap, "handicap" } + { TYPE_STRING, &ldi.identifier, "identifier" }, + { TYPE_STRING, &ldi.name, "name" }, + { TYPE_STRING, &ldi.name_sorting, "name_sorting" }, + { TYPE_STRING, &ldi.author, "author" }, + { TYPE_STRING, &ldi.imported_from, "imported_from" }, + { TYPE_STRING, &ldi.imported_by, "imported_by" }, + { TYPE_INTEGER, &ldi.levels, "levels" }, + { TYPE_INTEGER, &ldi.first_level, "first_level" }, + { TYPE_INTEGER, &ldi.sort_priority, "sort_priority" }, + { TYPE_BOOLEAN, &ldi.latest_engine, "latest_engine" }, + { TYPE_BOOLEAN, &ldi.level_group, "level_group" }, + { TYPE_BOOLEAN, &ldi.readonly, "readonly" }, + { TYPE_STRING, &ldi.graphics_ecs_set, "graphics_ecs_set" }, + { TYPE_STRING, &ldi.graphics_aga_set, "graphics_aga_set" }, + { TYPE_STRING, &ldi.graphics_set, "graphics_set" }, + { TYPE_STRING, &ldi.sounds_set, "sounds_set" }, + { TYPE_STRING, &ldi.music_set, "music_set" }, + { TYPE_STRING, &ldi.level_filename, "filename" }, + { TYPE_STRING, &ldi.level_filetype, "filetype" }, + { TYPE_BOOLEAN, &ldi.handicap, "handicap" }, + { TYPE_BOOLEAN, &ldi.skip_levels, "skip_levels" } }; static void setTreeInfoToDefaults(TreeInfo *ldi, int type) @@ -1640,6 +1771,7 @@ static void setTreeInfoToDefaults(TreeInfo *ldi, int type) ldi->sort_priority = LEVELCLASS_UNDEFINED; /* default: least priority */ ldi->latest_engine = FALSE; /* default: get from level */ ldi->parent_link = FALSE; + ldi->in_user_dir = FALSE; ldi->user_defined = FALSE; ldi->color = 0; ldi->class_desc = NULL; @@ -1647,7 +1779,10 @@ static void setTreeInfoToDefaults(TreeInfo *ldi, int type) if (ldi->type == TREE_TYPE_LEVEL_DIR) { ldi->imported_from = NULL; + ldi->imported_by = NULL; + ldi->graphics_ecs_set = NULL; + ldi->graphics_aga_set = NULL; ldi->graphics_set = NULL; ldi->sounds_set = NULL; ldi->music_set = NULL; @@ -1665,6 +1800,7 @@ static void setTreeInfoToDefaults(TreeInfo *ldi, int type) ldi->handicap_level = 0; ldi->readonly = TRUE; ldi->handicap = TRUE; + ldi->skip_levels = FALSE; } } @@ -1679,7 +1815,6 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ldi, TreeInfo *parent) return; } -#if 1 /* copy all values from the parent structure */ ldi->type = parent->type; @@ -1703,6 +1838,7 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ldi, TreeInfo *parent) ldi->sort_priority = parent->sort_priority; ldi->latest_engine = parent->latest_engine; ldi->parent_link = FALSE; + ldi->in_user_dir = parent->in_user_dir; ldi->user_defined = parent->user_defined; ldi->color = parent->color; ldi->class_desc = getStringCopy(parent->class_desc); @@ -1710,7 +1846,10 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ldi, TreeInfo *parent) if (ldi->type == TREE_TYPE_LEVEL_DIR) { ldi->imported_from = getStringCopy(parent->imported_from); + ldi->imported_by = getStringCopy(parent->imported_by); + ldi->graphics_ecs_set = NULL; + ldi->graphics_aga_set = NULL; ldi->graphics_set = NULL; ldi->sounds_set = NULL; ldi->music_set = NULL; @@ -1728,47 +1867,8 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ldi, TreeInfo *parent) ldi->handicap_level = 0; ldi->readonly = TRUE; ldi->handicap = TRUE; + ldi->skip_levels = FALSE; } - -#else - - /* first copy all values from the parent structure ... */ - *ldi = *parent; - - /* ... then set all fields to default that cannot be inherited from parent. - This is especially important for all those fields that can be set from - the 'levelinfo.conf' config file, because the function 'setSetupInfo()' - calls 'free()' for all already set token values which requires that no - other structure's pointer may point to them! - */ - - ldi->subdir = 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->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; - - ldi->node_top = parent->node_top; - ldi->node_parent = parent; - ldi->node_group = NULL; - ldi->next = NULL; - -#endif } static void freeTreeInfo(TreeInfo *ldi) @@ -1787,7 +1887,10 @@ static void freeTreeInfo(TreeInfo *ldi) if (ldi->type == TREE_TYPE_LEVEL_DIR) { checked_free(ldi->imported_from); + checked_free(ldi->imported_by); + checked_free(ldi->graphics_ecs_set); + checked_free(ldi->graphics_aga_set); checked_free(ldi->graphics_set); checked_free(ldi->sounds_set); checked_free(ldi->music_set); @@ -1891,7 +1994,6 @@ 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); @@ -1903,19 +2005,6 @@ static void createParentTreeInfoNode(TreeInfo *node_parent) ti_new->latest_engine = node_parent->latest_engine; 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); - - ti_new->subdir = ".."; - ti_new->fullpath = getStringCopy(node_parent->fullpath); - - ti_new->sort_priority = node_parent->sort_priority; - ti_new->latest_engine = node_parent->latest_engine; - - ti_new->class_desc = getLevelClassDescription(ti_new); -#endif pushTreeInfo(&node_parent->node_group, ti_new); } @@ -1930,10 +2019,21 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, { char *directory_path = getPath2(level_directory, directory_name); char *filename = getPath2(directory_path, LEVELINFO_FILENAME); - SetupFileHash *setup_file_hash = loadSetupFileHash(filename); + SetupFileHash *setup_file_hash; LevelDirTree *leveldir_new = NULL; int i; + /* unless debugging, silently ignore directories without "levelinfo.conf" */ + if (!options.debug && !fileExists(filename)) + { + free(directory_path); + free(filename); + + return FALSE; + } + + setup_file_hash = loadSetupFileHash(filename); + if (setup_file_hash == NULL) { Error(ERR_WARN, "ignoring level directory '%s'", directory_path); @@ -1953,7 +2053,8 @@ static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, leveldir_new->subdir = getStringCopy(directory_name); - checkSetupFileHashIdentifier(setup_file_hash, getCookie("LEVELINFO")); + checkSetupFileHashIdentifier(setup_file_hash, filename, + getCookie("LEVELINFO")); /* set all structure fields according to the token/value pairs */ ldi = *leveldir_new; @@ -1962,16 +2063,8 @@ 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->subdir); -#else - if (strcmp(leveldir_new->name, ANONYMOUS_NAME) == 0) - { - free(leveldir_new->name); - leveldir_new->name = getStringCopy(leveldir_new->subdir); - } -#endif DrawInitText(leveldir_new->name, 150, FC_YELLOW); @@ -1992,31 +2085,55 @@ 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; -#if 1 - leveldir_new->user_defined = + leveldir_new->in_user_dir = (strcmp(leveldir_new->basepath, options.level_directory) != 0); -#else + + /* adjust some settings if user's private level directory was detected */ + if (leveldir_new->sort_priority == LEVELCLASS_UNDEFINED && + leveldir_new->in_user_dir && + (strcmp(leveldir_new->subdir, getLoginName()) == 0 || + strcmp(leveldir_new->name, getLoginName()) == 0 || + strcmp(leveldir_new->author, getRealName()) == 0)) + { + leveldir_new->sort_priority = LEVELCLASS_PRIVATE_START; + leveldir_new->readonly = FALSE; + } + leveldir_new->user_defined = - (leveldir_new->basepath == options.level_directory ? FALSE : TRUE); -#endif + (leveldir_new->in_user_dir && IS_LEVELCLASS_PRIVATE(leveldir_new)); 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 || !leveldir_new->handicap ? leveldir_new->last_level : leveldir_new->first_level); +#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); freeSetupFileHash(setup_file_hash); @@ -2087,7 +2204,8 @@ static void LoadLevelInfoFromLevelDir(TreeInfo **node_first, closedir(dir); - if (!valid_entry_found) + /* special case: top level directory may directly contain "levelinfo.conf" */ + if (node_parent == NULL && !valid_entry_found) { /* check if this directory directly contains a file "levelinfo.conf" */ valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent, @@ -2099,6 +2217,25 @@ static void LoadLevelInfoFromLevelDir(TreeInfo **node_first, level_directory); } +boolean AdjustGraphicsForEMC() +{ + boolean settings_changed = FALSE; + +#if 1 + printf("::: AdjustGraphicsForEMC()\n"); + + settings_changed |= adjustTreeGraphics(leveldir_first_all); + settings_changed |= adjustTreeGraphics(leveldir_first); + + if (leveldir_current) + printf("::: X -> '%s'\n", leveldir_current->graphics_set); + else + printf("::: X (leveldir_current == NULL)\n"); +#endif + + return settings_changed; +} + void LoadLevelInfo() { InitUserLevelDirectory(getLoginName()); @@ -2108,6 +2245,17 @@ void LoadLevelInfo() LoadLevelInfoFromLevelDir(&leveldir_first, NULL, options.level_directory); LoadLevelInfoFromLevelDir(&leveldir_first, NULL, getUserLevelDir(NULL)); +#if 1 + /* after loading all level set information, clone the level directory tree + and remove all level sets without levels (these may still contain artwork + to be offered in the setup menu as "custom artwork", and are therefore + checked for existing artwork in the function "LoadLevelArtworkInfo()") */ + leveldir_first_all = leveldir_first; + cloneTree(&leveldir_first, leveldir_first_all, TRUE); +#endif + + AdjustGraphicsForEMC(); + /* before sorting, the first entries will be from the user directory */ leveldir_current = getFirstValidTreeInfoEntry(leveldir_first); @@ -2132,7 +2280,11 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, TreeInfo *artwork_new = NULL; int i; - if (access(filename, F_OK) == 0) /* file exists */ +#if 0 + printf("::: CHECKING FOR CONFIG FILE '%s'\n", filename); +#endif + + if (fileExists(filename)) setup_file_hash = loadSetupFileHash(filename); if (setup_file_hash == NULL) /* no config file -- look for artwork files */ @@ -2181,7 +2333,7 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, if (setup_file_hash) /* (before defining ".color" and ".class_desc") */ { #if 0 - checkSetupFileHashIdentifier(setup_file_hash, getCookie("...")); + checkSetupFileHashIdentifier(setup_file_hash, filename, getCookie("...")); #endif /* set all structure fields according to the token/value pairs */ @@ -2191,16 +2343,8 @@ 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->subdir); -#else - if (strcmp(artwork_new->name, ANONYMOUS_NAME) == 0) - { - free(artwork_new->name); - artwork_new->name = getStringCopy(artwork_new->subdir); - } -#endif #if 0 DrawInitText(artwork_new->name, 150, FC_YELLOW); @@ -2224,86 +2368,42 @@ static boolean LoadArtworkInfoFromArtworkConf(TreeInfo **node_first, artwork_new->fullpath = getPath2(node_parent->fullpath, directory_name); } -#if 1 - artwork_new->user_defined = + artwork_new->in_user_dir = (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->subdir, ".") == 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_PRIVATE; } 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->subdir); -#else - artwork_new->identifier = getStringCopy(artwork_new->subdir); -#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); @@ -2326,10 +2426,16 @@ static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first, struct dirent *dir_entry; boolean valid_entry_found = FALSE; +#if 0 + printf("::: CHECKING BASE DIR '%s'\n", base_directory); +#endif + if ((dir = opendir(base_directory)) == NULL) { + /* display error if directory is main "options.graphics_directory" etc. */ if (base_directory == OPTIONS_ARTWORK_DIRECTORY(type)) Error(ERR_WARN, "cannot read directory '%s'", base_directory); + return; } @@ -2339,7 +2445,7 @@ static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first, char *directory_name = dir_entry->d_name; char *directory_path = getPath2(base_directory, directory_name); - /* skip entries for current and parent directory */ + /* skip directory entries for current and parent directory */ if (strcmp(directory_name, ".") == 0 || strcmp(directory_name, "..") == 0) { @@ -2347,7 +2453,7 @@ static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first, continue; } - /* find out if directory entry is itself a directory */ + /* 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 */ { @@ -2358,7 +2464,7 @@ static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first, free(directory_path); /* check if this directory contains artwork with or without config file */ - valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first,node_parent, + valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first, node_parent, base_directory, directory_name, type); } @@ -2366,7 +2472,7 @@ static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first, closedir(dir); /* check if this directory directly contains artwork itself */ - valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first,node_parent, + valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first, node_parent, base_directory, ".", type); if (!valid_entry_found) @@ -2381,7 +2487,6 @@ static TreeInfo *getDummyArtworkInfo(int type) setTreeInfoToDefaults(artwork_new, type); -#if 1 setString(&artwork_new->subdir, UNDEFINED_FILENAME); setString(&artwork_new->fullpath, UNDEFINED_FILENAME); setString(&artwork_new->basepath, UNDEFINED_FILENAME); @@ -2389,17 +2494,6 @@ static TreeInfo *getDummyArtworkInfo(int type) setString(&artwork_new->identifier, UNDEFINED_FILENAME); setString(&artwork_new->name, UNDEFINED_FILENAME); setString(&artwork_new->name_sorting, UNDEFINED_FILENAME); -#else - artwork_new->subdir = getStringCopy(UNDEFINED_FILENAME); - artwork_new->fullpath = getStringCopy(UNDEFINED_FILENAME); - artwork_new->basepath = getStringCopy(UNDEFINED_FILENAME); - - checked_free(artwork_new->name); - - artwork_new->identifier = getStringCopy(UNDEFINED_FILENAME); - artwork_new->name = getStringCopy(UNDEFINED_FILENAME); - artwork_new->name_sorting = getStringCopy(UNDEFINED_FILENAME); -#endif return artwork_new; } @@ -2482,6 +2576,36 @@ void LoadArtworkInfo() #endif } +void LoadArtworkInfoFromLevelNode(ArtworkDirTree **artwork_node, + LevelDirTree *level_node, + char *artwork_directory) +{ + TreeInfo *topnode_last = *artwork_node; + char *path = getPath2(getLevelDirFromTreeInfo(level_node), artwork_directory); + +#if 1 + printf("::: CHECKING '%s' ...\n", path); +#endif + + LoadArtworkInfoFromArtworkDir(artwork_node, NULL, path,(*artwork_node)->type); + + if (topnode_last != *artwork_node) + { + free((*artwork_node)->identifier); + free((*artwork_node)->name); + free((*artwork_node)->name_sorting); + + (*artwork_node)->identifier = getStringCopy(level_node->subdir); + (*artwork_node)->name = getStringCopy(level_node->name); + (*artwork_node)->name_sorting = getStringCopy(level_node->name); + + (*artwork_node)->sort_priority = level_node->sort_priority; + (*artwork_node)->color = LEVELCOLOR((*artwork_node)); + } + + free(path); +} + void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node, LevelDirTree *level_node) { @@ -2489,18 +2613,34 @@ void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node, while (level_node) { - char *path = getPath2(getLevelDirFromTreeInfo(level_node), - ARTWORK_DIRECTORY((*artwork_node)->type)); - -#if 0 - if (!level_node->parent_link) - printf("CHECKING '%s' ['%s', '%s'] ...\n", path, - level_node->subdir, level_node->name); -#endif - + /* check all tree entries for artwork, but skip parent link entries */ if (!level_node->parent_link) { +#if 1 + struct + { + int type; + char *dir; + } + artwork_type_dirs[] = + { + { ARTWORK_TYPE_GRAPHICS, GRAPHICS_DIRECTORY }, + { ARTWORK_TYPE_GRAPHICS, GRAPHICS_ECS_DIRECTORY }, + { ARTWORK_TYPE_GRAPHICS, GRAPHICS_AGA_DIRECTORY }, + { ARTWORK_TYPE_SOUNDS, SOUNDS_DIRECTORY }, + { ARTWORK_TYPE_MUSIC, MUSIC_DIRECTORY }, + { -1, NULL } + }; + int i; + + for (i = 0; artwork_type_dirs[i].type != -1; i++) + if ((*artwork_node)->type == artwork_type_dirs[i].type) + LoadArtworkInfoFromLevelNode(artwork_node, level_node, + artwork_type_dirs[i].dir); +#else TreeInfo *topnode_last = *artwork_node; + char *path = getPath2(getLevelDirFromTreeInfo(level_node), + ARTWORK_DIRECTORY((*artwork_node)->type)); LoadArtworkInfoFromArtworkDir(artwork_node, NULL, path, (*artwork_node)->type); @@ -2518,9 +2658,10 @@ void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node, (*artwork_node)->sort_priority = level_node->sort_priority; (*artwork_node)->color = LEVELCOLOR((*artwork_node)); } - } - free(path); + free(path); +#endif + } if (level_node->node_group != NULL) LoadArtworkInfoFromLevelInfo(artwork_node, level_node->node_group); @@ -2533,9 +2674,9 @@ 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); + LoadArtworkInfoFromLevelInfo(&artwork.gfx_first, leveldir_first_all); + LoadArtworkInfoFromLevelInfo(&artwork.snd_first, leveldir_first_all); + LoadArtworkInfoFromLevelInfo(&artwork.mus_first, leveldir_first_all); /* needed for reloading level artwork not known at ealier stage */ @@ -2604,40 +2745,32 @@ static void SaveUserLevelInfo() /* 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_PRIVATE_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_PRIVATE_START; - ldi.readonly = FALSE; - ldi.graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR); - ldi.sounds_set = getStringCopy(SND_CLASSIC_SUBDIR); - ldi.music_set = getStringCopy(MUS_CLASSIC_SUBDIR); -#endif + + token_value_position = TOKEN_VALUE_POSITION_SHORT; fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, getCookie("LEVELINFO"))); ldi = *level_info; for (i = 0; i < NUM_LEVELINFO_TOKENS; i++) - if (i != LEVELINFO_TOKEN_IDENTIFIER && - i != LEVELINFO_TOKEN_NAME_SORTING && - i != LEVELINFO_TOKEN_IMPORTED_FROM && - i != LEVELINFO_TOKEN_FILENAME && - i != LEVELINFO_TOKEN_FILETYPE) + { + if (i == LEVELINFO_TOKEN_NAME || + i == LEVELINFO_TOKEN_AUTHOR || + i == LEVELINFO_TOKEN_LEVELS || + i == LEVELINFO_TOKEN_FIRST_LEVEL) fprintf(file, "%s\n", getSetupLine(levelinfo_tokens, "", i)); + /* just to make things nicer :) */ + if (i == LEVELINFO_TOKEN_AUTHOR) + fprintf(file, "\n"); + } + + token_value_position = TOKEN_VALUE_POSITION_DEFAULT; + fclose(file); SetFilePermissions(filename, PERMS_PRIVATE); @@ -2667,6 +2800,10 @@ char *getSetupValue(int type, void *value) strcpy(value_string, (*(boolean *)value ? "yes" : "no")); break; + case TYPE_ECS_AGA: + strcpy(value_string, (*(boolean *)value ? "AGA" : "ECS")); + break; + case TYPE_KEY: strcpy(value_string, getKeyNameFromKey(*(Key *)value)); break; @@ -2688,6 +2825,9 @@ char *getSetupValue(int type, void *value) break; } + if (type & TYPE_GHOSTED) + strcpy(value_string, "n/a"); + return value_string; } @@ -2718,7 +2858,7 @@ char *getSetupLine(struct TokenInfo *token_info, char *prefix, int token_nr) { /* add at least one whitespace */ strcat(line, " "); - for (i = strlen(line); i < TOKEN_COMMENT_POSITION; i++) + for (i = strlen(line); i < token_comment_position; i++) strcat(line, " "); strcat(line, "# "); @@ -2751,7 +2891,8 @@ void LoadLevelSetup_LastSeries() if (leveldir_current == NULL) leveldir_current = getFirstValidTreeInfoEntry(leveldir_first); - checkSetupFileHashIdentifier(level_setup_hash, getCookie("LEVELSETUP")); + checkSetupFileHashIdentifier(level_setup_hash, filename, + getCookie("LEVELSETUP")); freeSetupFileHash(level_setup_hash); } @@ -2800,7 +2941,7 @@ static void checkSeriesInfo() /* check for more levels besides the 'levels' field of 'levelinfo.conf' */ - level_directory = getPath2((leveldir_current->user_defined ? + level_directory = getPath2((leveldir_current->in_user_dir ? getUserLevelDir(NULL) : options.level_directory), leveldir_current->fullpath); @@ -2895,7 +3036,8 @@ void LoadLevelSetup_SeriesInfo() leveldir_current->handicap_level = level_nr; } - checkSetupFileHashIdentifier(level_setup_hash, getCookie("LEVELSETUP")); + checkSetupFileHashIdentifier(level_setup_hash, filename, + getCookie("LEVELSETUP")); freeSetupFileHash(level_setup_hash); }