X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=2c7dcfd7c8742db7418d6da057c59b644dc1ba83;hb=a2c9a458aaa4ac568f07ecd25b19fbca3f766e6b;hp=d0f2bc06d7c72db48bbe8a97ff2b98f0819de6fd;hpb=41e8d55b767c898f20c29a1b0b8d2ef8840be2f5;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index d0f2bc06..2c7dcfd7 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -11,8 +11,9 @@ * setup.c * ***********************************************************/ -#include +#include #include +#include #include #include @@ -20,33 +21,11 @@ #include "joystick.h" #include "text.h" #include "misc.h" +#include "hash.h" -/* file identifier strings */ -#define SETUP_COOKIE "ROCKSNDIAMONDS_SETUP_FILE_VERSION_1.2" -#define LEVELSETUP_COOKIE "ROCKSNDIAMONDS_LEVELSETUP_FILE_VERSION_1.2" -#define LEVELINFO_COOKIE "ROCKSNDIAMONDS_LEVELINFO_FILE_VERSION_1.2" - -/* file names and filename extensions */ -#if !defined(PLATFORM_MSDOS) -#define LEVELSETUP_DIRECTORY "levelsetup" -#define SETUP_FILENAME "setup.conf" -#define LEVELSETUP_FILENAME "levelsetup.conf" -#define LEVELINFO_FILENAME "levelinfo.conf" -#define LEVELFILE_EXTENSION "level" -#define TAPEFILE_EXTENSION "tape" -#define SCOREFILE_EXTENSION "score" -#else -#define LEVELSETUP_DIRECTORY "lvlsetup" -#define SETUP_FILENAME "setup.cnf" -#define LEVELSETUP_FILENAME "lvlsetup.cnf" -#define LEVELINFO_FILENAME "lvlinfo.cnf" -#define LEVELFILE_EXTENSION "lvl" -#define TAPEFILE_EXTENSION "tap" -#define SCOREFILE_EXTENSION "sco" -#endif - #define NUM_LEVELCLASS_DESC 8 + static char *levelclass_desc[NUM_LEVELCLASS_DESC] = { "Tutorial Levels", @@ -59,67 +38,50 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] = "DX Boulderdash" }; -#define LEVELCOLOR(n) (IS_LEVELCLASS_TUTORIAL(n) ? FC_BLUE : \ - IS_LEVELCLASS_CLASSICS(n) ? FC_RED : \ - IS_LEVELCLASS_BD(n) ? FC_GREEN : \ - IS_LEVELCLASS_EM(n) ? FC_YELLOW : \ - IS_LEVELCLASS_SP(n) ? FC_GREEN : \ - IS_LEVELCLASS_DX(n) ? FC_YELLOW : \ - IS_LEVELCLASS_CONTRIBUTION(n) ? FC_GREEN : \ - IS_LEVELCLASS_USER(n) ? FC_RED : \ + +#define LEVELCOLOR(n) (IS_LEVELCLASS_TUTORIAL(n) ? FC_BLUE : \ + IS_LEVELCLASS_CLASSICS(n) ? FC_RED : \ + IS_LEVELCLASS_BD(n) ? FC_GREEN : \ + IS_LEVELCLASS_EM(n) ? FC_YELLOW : \ + IS_LEVELCLASS_SP(n) ? FC_GREEN : \ + IS_LEVELCLASS_DX(n) ? FC_YELLOW : \ + IS_LEVELCLASS_CONTRIB(n) ? FC_GREEN : \ + IS_LEVELCLASS_PRIVATE(n) ? FC_RED : \ FC_BLUE) -#define LEVELSORTING(n) (IS_LEVELCLASS_TUTORIAL(n) ? 0 : \ - IS_LEVELCLASS_CLASSICS(n) ? 1 : \ - IS_LEVELCLASS_BD(n) ? 2 : \ - IS_LEVELCLASS_EM(n) ? 3 : \ - IS_LEVELCLASS_SP(n) ? 4 : \ - IS_LEVELCLASS_DX(n) ? 5 : \ - IS_LEVELCLASS_CONTRIBUTION(n) ? 6 : \ - IS_LEVELCLASS_USER(n) ? 7 : \ +#define LEVELSORTING(n) (IS_LEVELCLASS_TUTORIAL(n) ? 0 : \ + IS_LEVELCLASS_CLASSICS(n) ? 1 : \ + IS_LEVELCLASS_BD(n) ? 2 : \ + 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 : \ 9) -/* values for setup file stuff */ -#define TYPE_BOOLEAN 1 -#define TYPE_SWITCH 2 -#define TYPE_KEY 3 -#define TYPE_INTEGER 4 -#define TYPE_STRING 5 - -#define TOKEN_STR_FILE_IDENTIFIER "file_identifier" +#define ARTWORKCOLOR(n) (IS_ARTWORKCLASS_CLASSICS(n) ? FC_RED : \ + IS_ARTWORKCLASS_CONTRIB(n) ? FC_YELLOW : \ + IS_ARTWORKCLASS_PRIVATE(n) ? FC_RED : \ + IS_ARTWORKCLASS_LEVEL(n) ? FC_GREEN : \ + FC_BLUE) -#define TOKEN_VALUE_POSITION 30 +#define ARTWORKSORTING(n) (IS_ARTWORKCLASS_CLASSICS(n) ? 0 : \ + IS_ARTWORKCLASS_LEVEL(n) ? 1 : \ + IS_ARTWORKCLASS_CONTRIB(n) ? 2 : \ + IS_ARTWORKCLASS_PRIVATE(n) ? 3 : \ + 9) -struct SetupFileList -{ - char *token; - char *value; - struct SetupFileList *next; -}; +#define TOKEN_VALUE_POSITION 40 +#define TOKEN_COMMENT_POSITION 60 -struct TokenInfo -{ - int type; - void *value; - char *text; -}; +#define MAX_COOKIE_LEN 256 /* ------------------------------------------------------------------------- */ /* file functions */ /* ------------------------------------------------------------------------- */ -/* -int get_string_integer_value(char *); -boolean get_string_boolean_value(char *); -char *getFormattedSetupEntry(char *, char *); -void freeSetupFileList(struct SetupFileList *); -char *getTokenValue(struct SetupFileList *, char *); -struct SetupFileList *loadSetupFileList(char *); -void checkSetupFileListIdentifier(struct SetupFileList *, char *); -*/ - -char *getLevelClassDescription(struct LevelDirInfo *ldi) +static char *getLevelClassDescription(TreeInfo *ldi) { int position = ldi->sort_priority / 100; @@ -129,12 +91,6 @@ char *getLevelClassDescription(struct LevelDirInfo *ldi) return "Unknown Level Class"; } -/* for 'InitUserLevelDir()' */ -static void SaveUserLevelInfo(); - -/* for 'SaveUserLevelInfo()' */ -static char *getSetupLine(struct TokenInfo *, char *, int); - static char *getUserLevelDir(char *level_subdir) { static char *userlevel_dir = NULL; @@ -144,7 +100,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); @@ -161,7 +117,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); @@ -172,13 +128,13 @@ static char *getTapeDir(char *level_subdir) static char *getScoreDir(char *level_subdir) { static char *score_dir = NULL; - char *data_dir = options.rw_base_directory; + char *data_dir = getCommonDataDir(); char *score_subdir = SCORES_DIRECTORY; 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); @@ -195,7 +151,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); @@ -203,6 +159,194 @@ static char *getLevelSetupDir(char *level_subdir) return levelsetup_dir; } +static char *getLevelDirFromTreeInfo(TreeInfo *node) +{ + static char *level_dir = NULL; + + if (node == NULL) + return options.level_directory; + + if (level_dir) + free(level_dir); + + level_dir = getPath2((node->user_defined ? getUserLevelDir(NULL) : + options.level_directory), node->fullpath); + + return level_dir; +} + +static char *getCurrentLevelDir() +{ + return getLevelDirFromTreeInfo(leveldir_current); +} + +static char *getDefaultGraphicsDir(char *graphics_subdir) +{ + static char *graphics_dir = NULL; + + 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 *getDefaultArtworkSet(int type) +{ + return (type == TREE_TYPE_GRAPHICS_DIR ? GFX_CLASSIC_SUBDIR : + type == TREE_TYPE_SOUNDS_DIR ? SND_CLASSIC_SUBDIR : + type == TREE_TYPE_MUSIC_DIR ? MUS_CLASSIC_SUBDIR : ""); +} + +static char *getDefaultArtworkDir(int type) +{ + return (type == TREE_TYPE_GRAPHICS_DIR ? + getDefaultGraphicsDir(GFX_CLASSIC_SUBDIR) : + type == TREE_TYPE_SOUNDS_DIR ? + getDefaultSoundsDir(SND_CLASSIC_SUBDIR) : + type == TREE_TYPE_MUSIC_DIR ? + getDefaultMusicDir(MUS_CLASSIC_SUBDIR) : ""); +} + +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; +} + +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; +} + +char *setLevelArtworkDir(TreeInfo *ti) +{ + char **artwork_path_ptr, **artwork_set_ptr; + TreeInfo *level_artwork; + + 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)); + + if (*artwork_path_ptr != NULL) + free(*artwork_path_ptr); + + if ((level_artwork = getTreeInfoFromIdentifier(ti, *artwork_set_ptr))) + *artwork_path_ptr = getStringCopy(getSetupArtworkDir(level_artwork)); + else + { + /* No (or non-existing) artwork configured in "levelinfo.conf". This would + normally result in using the artwork configured in the setup menu. But + if an artwork subdirectory exists (which might contain custom artwork + or an artwork configuration file), this level artwork must be treated + as relative to the default "classic" artwork, not to the artwork that + is currently configured in the setup menu. */ + + char *dir = getPath2(getCurrentLevelDir(), ARTWORK_DIRECTORY(ti->type)); + + if (*artwork_set_ptr != NULL) + free(*artwork_set_ptr); + + if (fileExists(dir)) + { + *artwork_path_ptr = getStringCopy(getDefaultArtworkDir(ti->type)); + *artwork_set_ptr = getStringCopy(getDefaultArtworkSet(ti->type)); + } + else + { + *artwork_path_ptr = getStringCopy(UNDEFINED_FILENAME); + *artwork_set_ptr = NULL; + } + + free(dir); + } + + return *artwork_set_ptr; +} + +inline static char *getLevelArtworkSet(int type) +{ + if (leveldir_current == NULL) + return NULL; + + return LEVELDIR_ARTWORK_SET(leveldir_current, type); +} + +inline static char *getLevelArtworkDir(int type) +{ + if (leveldir_current == NULL) + return UNDEFINED_FILENAME; + + return LEVELDIR_ARTWORK_PATH(leveldir_current, type); +} + char *getLevelFilename(int nr) { static char *filename = NULL; @@ -211,12 +355,12 @@ char *getLevelFilename(int nr) if (filename != NULL) free(filename); - sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION); - filename = getPath3((leveldir_current->user_defined ? - getUserLevelDir("") : - options.level_directory), - leveldir_current->fullpath, - basename); + if (nr < 0) + sprintf(basename, "template.%s", LEVELFILE_EXTENSION); + else + sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION); + + filename = getPath2(getCurrentLevelDir(), basename); return filename; } @@ -249,25 +393,275 @@ char *getScoreFilename(int nr) return filename; } +char *getSetupFilename() +{ + static char *filename = NULL; + + if (filename != NULL) + free(filename); + + filename = getPath2(getSetupDir(), SETUP_FILENAME); + + return filename; +} + +static char *getCorrectedArtworkBasename(char *basename) +{ + char *basename_corrected = basename; + +#if defined(PLATFORM_MSDOS) + if (program.filename_prefix != NULL) + { + int prefix_len = strlen(program.filename_prefix); + + if (strncmp(basename, program.filename_prefix, prefix_len) == 0) + 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 (msdos_filename != NULL) + free(msdos_filename); + + msdos_filename = getStringCopy(basename_corrected); + strncpy(&msdos_filename[8], &basename[strlen(basename) - (1+3)], 1+3 +1); + + basename_corrected = msdos_filename; + } + } +#endif + + return basename_corrected; +} + +char *getCustomImageFilename(char *basename) +{ + static char *filename = NULL; + boolean skip_setup_artwork = FALSE; + + if (filename != NULL) + free(filename); + + basename = getCorrectedArtworkBasename(basename); + + if (!setup.override_level_graphics) + { + /* 1st try: look for special artwork in current level series directory */ + filename = getPath3(getCurrentLevelDir(), GRAPHICS_DIRECTORY, basename); + if (fileExists(filename)) + return filename; + + free(filename); + + /* check if there is special artwork configured in level series config */ + if (getLevelArtworkSet(ARTWORK_TYPE_GRAPHICS) != NULL) + { + /* 2nd try: look for special artwork configured in level series config */ + filename = getPath2(getLevelArtworkDir(ARTWORK_TYPE_GRAPHICS), basename); + if (fileExists(filename)) + return filename; + + free(filename); + + /* take missing artwork configured in level set config from default */ + skip_setup_artwork = TRUE; + } + } + + if (!skip_setup_artwork) + { + /* 3rd try: look for special artwork in configured artwork directory */ + filename = getPath2(getSetupArtworkDir(artwork.gfx_current), basename); + if (fileExists(filename)) + return filename; + + free(filename); + } + + /* 4th try: look for default artwork in new default artwork directory */ + filename = getPath2(getDefaultGraphicsDir(GFX_CLASSIC_SUBDIR), basename); + if (fileExists(filename)) + return filename; + + free(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 specified artwork file anywhere */ +} + +char *getCustomSoundFilename(char *basename) +{ + static char *filename = NULL; + boolean skip_setup_artwork = FALSE; + + if (filename != NULL) + free(filename); + + basename = getCorrectedArtworkBasename(basename); + + if (!setup.override_level_sounds) + { + /* 1st try: look for special artwork in current level series directory */ + filename = getPath3(getCurrentLevelDir(), SOUNDS_DIRECTORY, basename); + if (fileExists(filename)) + return filename; + + free(filename); + + /* check if there is special artwork configured in level series config */ + if (getLevelArtworkSet(ARTWORK_TYPE_SOUNDS) != NULL) + { + /* 2nd try: look for special artwork configured in level series config */ + filename = getPath2(getLevelArtworkDir(TREE_TYPE_SOUNDS_DIR), basename); + if (fileExists(filename)) + return filename; + + free(filename); + + /* take missing artwork configured in level set config from default */ + skip_setup_artwork = TRUE; + } + } + + if (!skip_setup_artwork) + { + /* 3rd try: look for special artwork in configured artwork directory */ + filename = getPath2(getSetupArtworkDir(artwork.snd_current), basename); + if (fileExists(filename)) + return filename; + + free(filename); + } + + /* 4th try: look for default artwork in new default artwork directory */ + filename = getPath2(getDefaultSoundsDir(SND_CLASSIC_SUBDIR), basename); + if (fileExists(filename)) + return filename; + + free(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 specified artwork file anywhere */ +} + +char *getCustomArtworkFilename(char *basename, int type) +{ + 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 *getCustomArtworkLevelConfigFilename(int type) +{ + static char *filename = NULL; + + if (filename != NULL) + free(filename); + + filename = getPath2(getLevelArtworkDir(type), ARTWORKINFO_FILENAME(type)); + + return filename; +} + +char *getCustomMusicDirectory(void) +{ + static char *directory = NULL; + boolean skip_setup_artwork = FALSE; + + if (directory != NULL) + free(directory); + + if (!setup.override_level_music) + { + /* 1st try: look for special artwork in current level series directory */ + directory = getPath2(getCurrentLevelDir(), MUSIC_DIRECTORY); + if (fileExists(directory)) + return directory; + + free(directory); + + /* check if there is special artwork configured in level series config */ + if (getLevelArtworkSet(ARTWORK_TYPE_MUSIC) != NULL) + { + /* 2nd try: look for special artwork configured in level series config */ + directory = getStringCopy(getLevelArtworkDir(TREE_TYPE_MUSIC_DIR)); + if (fileExists(directory)) + return directory; + + free(directory); + + /* take missing artwork configured in level set config from default */ + skip_setup_artwork = TRUE; + } + } + + if (!skip_setup_artwork) + { + /* 3rd try: look for special artwork in configured artwork directory */ + directory = getStringCopy(getSetupArtworkDir(artwork.mus_current)); + if (fileExists(directory)) + return directory; + + free(directory); + } + + /* 4th try: look for default artwork in new default artwork directory */ + directory = getStringCopy(getDefaultMusicDir(MUS_CLASSIC_SUBDIR)); + if (fileExists(directory)) + return directory; + + free(directory); + + /* 5th try: look for default artwork in old default artwork directory */ + directory = getStringCopy(options.music_directory); + if (fileExists(directory)) + return directory; + + return NULL; /* cannot find specified artwork file anywhere */ +} + 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(getCommonDataDir(), "common data", PERMS_PUBLIC); + createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC); createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC); } +static void SaveUserLevelInfo(); + 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,72 +671,27 @@ 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); } -void ReadChunk_VERS(FILE *file, int *file_version, int *game_version) -{ - int file_version_major, file_version_minor, file_version_patch; - int game_version_major, game_version_minor, game_version_patch; - - file_version_major = fgetc(file); - file_version_minor = fgetc(file); - file_version_patch = fgetc(file); - fgetc(file); /* not used */ - - game_version_major = fgetc(file); - game_version_minor = fgetc(file); - game_version_patch = fgetc(file); - fgetc(file); /* not used */ - - *file_version = VERSION_IDENT(file_version_major, - file_version_minor, - file_version_patch); - - *game_version = VERSION_IDENT(game_version_major, - game_version_minor, - game_version_patch); -} - -void WriteChunk_VERS(FILE *file, int file_version, int game_version) -{ - int file_version_major = VERSION_MAJOR(file_version); - int file_version_minor = VERSION_MINOR(file_version); - int file_version_patch = VERSION_PATCH(file_version); - int game_version_major = VERSION_MAJOR(game_version); - int game_version_minor = VERSION_MINOR(game_version); - int game_version_patch = VERSION_PATCH(game_version); - - fputc(file_version_major, file); - fputc(file_version_minor, file); - fputc(file_version_patch, file); - fputc(0, file); /* not used */ - - fputc(game_version_major, file); - fputc(game_version_minor, file); - fputc(game_version_patch, file); - fputc(0, file); /* not used */ -} - /* ------------------------------------------------------------------------- */ /* 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 +704,48 @@ 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); - else - return NULL; - } - else if (node->node_group) /* enter level group (step down into tree) */ - return getFirstValidLevelSeries(node->node_group); + return NULL; + + if (node->node_group) /* enter level group (step down into tree) */ + 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 +760,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,26 +777,25 @@ struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *node, int pos) return node_default; } -struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node, - char *filename) +TreeInfo *getTreeInfoFromIdentifier(TreeInfo *node, char *identifier) { - if (filename == NULL) + if (identifier == NULL) return NULL; while (node) { if (node->node_group) { - struct LevelDirInfo *node_group; + TreeInfo *node_group; - node_group = getLevelDirInfoFromFilenameExt(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) + if (strcmp(identifier, node->identifier) == 0) return node; } @@ -461,42 +805,45 @@ struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node, return NULL; } -struct LevelDirInfo *getLevelDirInfoFromFilename(char *filename) -{ - return getLevelDirInfoFromFilenameExt(leveldir_first, 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); +#if 1 + printf("filename == '%s' ['%s', '%s'] [%d])\n", + node->filename, node->fullpath, node->basepath, node->user_defined); +#else + printf("filename == '%s' (%s) [%s] (%d)\n", + node->filename, node->name, node->identifier, node->sort_priority); +#endif if (node->node_group != NULL) - 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 +855,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 +873,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; } @@ -583,17 +930,35 @@ char *getUserDataDir(void) { static char *userdata_dir = NULL; - if (!userdata_dir) - { - char *home_dir = getHomeDir(); - char *data_dir = program.userdata_directory; - - userdata_dir = getPath2(home_dir, data_dir); - } + if (userdata_dir == NULL) + userdata_dir = getPath2(getHomeDir(), program.userdata_directory); return userdata_dir; } +char *getCommonDataDir(void) +{ + static char *common_data_dir = NULL; + +#if defined(PLATFORM_WIN32) + if (common_data_dir == NULL) + { + char *dir = checked_malloc(MAX_PATH + 1); + + if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_COMMON_DOCUMENTS, NULL, 0, dir)) + && strcmp(dir, "") != 0) /* empty for Windows 95/98 */ + common_data_dir = getPath2(dir, program.userdata_directory); + else + common_data_dir = options.rw_base_directory; + } +#else + if (common_data_dir == NULL) + common_data_dir = options.rw_base_directory; +#endif + + return common_data_dir; +} + char *getSetupDir() { return getUserDataDir(); @@ -645,6 +1010,21 @@ void SetFilePermissions(char *filename, int permission_class) FILE_PERMS_PRIVATE : FILE_PERMS_PUBLIC)); } +char *getCookie(char *file_type) +{ + static char cookie[MAX_COOKIE_LEN + 1]; + + if (strlen(program.cookie_prefix) + 1 + + strlen(file_type) + strlen("_FILE_VERSION_x.x") > MAX_COOKIE_LEN) + return "[COOKIE ERROR]"; /* should never happen */ + + sprintf(cookie, "%s_%s_FILE_VERSION_%d.%d", + program.cookie_prefix, file_type, + program.version_major, program.version_minor); + + return cookie; +} + int getFileVersionFromCookieString(const char *cookie) { const char *ptr_cookie1, *ptr_cookie2; @@ -693,157 +1073,208 @@ boolean checkCookieString(const char *cookie, const char *template) } /* ------------------------------------------------------------------------- */ -/* setup file list handling functions */ +/* setup file list and hash handling functions */ /* ------------------------------------------------------------------------- */ -int get_string_integer_value(char *s) +char *getFormattedSetupEntry(char *token, char *value) { - static char *number_text[][3] = - { - { "0", "zero", "null", }, - { "1", "one", "first" }, - { "2", "two", "second" }, - { "3", "three", "third" }, - { "4", "four", "fourth" }, - { "5", "five", "fifth" }, - { "6", "six", "sixth" }, - { "7", "seven", "seventh" }, - { "8", "eight", "eighth" }, - { "9", "nine", "ninth" }, - { "10", "ten", "tenth" }, - { "11", "eleven", "eleventh" }, - { "12", "twelve", "twelfth" }, - }; + int i; + static char entry[MAX_LINE_LEN]; + + /* start with the token and some spaces to format output line */ + sprintf(entry, "%s:", token); + for (i=strlen(entry); itoken = getStringCopy(token); + new->value = getStringCopy(value); - free(s_lower); + new->next = NULL; - return result; + return new; } -boolean get_string_boolean_value(char *s) +void freeSetupFileList(SetupFileList *list) { - char *s_lower = getStringToLower(s); - boolean result = FALSE; + if (list == NULL) + return; - if (strcmp(s_lower, "true") == 0 || - strcmp(s_lower, "yes") == 0 || - strcmp(s_lower, "on") == 0 || - get_string_integer_value(s) == 1) - result = TRUE; + if (list->token) + free(list->token); + if (list->value) + free(list->value); + if (list->next) + freeSetupFileList(list->next); + free(list); +} - free(s_lower); +char *getListEntry(SetupFileList *list, char *token) +{ + if (list == NULL) + return NULL; - return result; + if (strcmp(list->token, token) == 0) + return list->value; + else + return getListEntry(list->next, token); } -char *getFormattedSetupEntry(char *token, char *value) +SetupFileList *setListEntry(SetupFileList *list, char *token, char *value) { - int i; - static char entry[MAX_LINE_LEN]; + if (list == NULL) + return NULL; - sprintf(entry, "%s:", token); - for (i=strlen(entry); itoken, token) == 0) + { + if (list->value) + free(list->value); - strcat(entry, value); + list->value = getStringCopy(value); - return entry; + return list; + } + else if (list->next == NULL) + return (list->next = newSetupFileList(token, value)); + else + return setListEntry(list->next, token, value); } -void freeSetupFileList(struct SetupFileList *setup_file_list) +#ifdef DEBUG +static void printSetupFileList(SetupFileList *list) { - if (!setup_file_list) + if (!list) return; - if (setup_file_list->token) - free(setup_file_list->token); - if (setup_file_list->value) - free(setup_file_list->value); - if (setup_file_list->next) - freeSetupFileList(setup_file_list->next); - free(setup_file_list); + printf("token: '%s'\n", list->token); + printf("value: '%s'\n", list->value); + + printSetupFileList(list->next); } +#endif + +#ifdef DEBUG +DEFINE_HASHTABLE_INSERT(insert_hash_entry, char, char); +DEFINE_HASHTABLE_SEARCH(search_hash_entry, char, char); +DEFINE_HASHTABLE_CHANGE(change_hash_entry, char, char); +DEFINE_HASHTABLE_REMOVE(remove_hash_entry, char, char); +#else +#define insert_hash_entry hashtable_insert +#define search_hash_entry hashtable_search +#define change_hash_entry hashtable_change +#define remove_hash_entry hashtable_remove +#endif -static struct SetupFileList *newSetupFileList(char *token, char *value) +static unsigned int get_hash_from_key(void *key) { - struct SetupFileList *new = checked_malloc(sizeof(struct SetupFileList)); + /* + djb2 - new->token = checked_malloc(strlen(token) + 1); - strcpy(new->token, token); + This algorithm (k=33) was first reported by Dan Bernstein many years ago in + 'comp.lang.c'. Another version of this algorithm (now favored by Bernstein) + uses XOR: hash(i) = hash(i - 1) * 33 ^ str[i]; the magic of number 33 (why + it works better than many other constants, prime or not) has never been + adequately explained. - new->value = checked_malloc(strlen(value) + 1); - strcpy(new->value, value); + If you just want to have a good hash function, and cannot wait, djb2 + is one of the best string hash functions i know. It has excellent + distribution and speed on many different sets of keys and table sizes. + You are not likely to do better with one of the "well known" functions + such as PJW, K&R, etc. - new->next = NULL; + Ozan (oz) Yigit [http://www.cs.yorku.ca/~oz/hash.html] + */ - return new; + char *str = (char *)key; + unsigned int hash = 5381; + int c; + + while ((c = *str++)) + hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ + + return hash; } -char *getTokenValue(struct SetupFileList *setup_file_list, char *token) +static int keys_are_equal(void *key1, void *key2) { - if (!setup_file_list) - return NULL; + return (strcmp((char *)key1, (char *)key2) == 0); +} - if (strcmp(setup_file_list->token, token) == 0) - return setup_file_list->value; - else - return getTokenValue(setup_file_list->next, token); +SetupFileHash *newSetupFileHash() +{ + SetupFileHash *new_hash = + create_hashtable(16, 0.75, get_hash_from_key, keys_are_equal); + + return new_hash; } -static void setTokenValue(struct SetupFileList *setup_file_list, - char *token, char *value) +void freeSetupFileHash(SetupFileHash *hash) { - if (!setup_file_list) + if (hash == NULL) return; - if (strcmp(setup_file_list->token, token) == 0) - { - free(setup_file_list->value); - setup_file_list->value = checked_malloc(strlen(value) + 1); - strcpy(setup_file_list->value, value); - } - else if (setup_file_list->next == NULL) - setup_file_list->next = newSetupFileList(token, value); - else - setTokenValue(setup_file_list->next, token, value); + hashtable_destroy(hash, 1); /* 1 == also free values stored in hash */ } -#ifdef DEBUG -static void printSetupFileList(struct SetupFileList *setup_file_list) +char *getHashEntry(SetupFileHash *hash, char *token) +{ + if (hash == NULL) + return NULL; + + return search_hash_entry(hash, token); +} + +void setHashEntry(SetupFileHash *hash, char *token, char *value) { - if (!setup_file_list) + char *value_copy; + + if (hash == NULL) return; - printf("token: '%s'\n", setup_file_list->token); - printf("value: '%s'\n", setup_file_list->value); + value_copy = getStringCopy(value); - printSetupFileList(setup_file_list->next); + /* change value; if it does not exist, insert it as new */ + if (!change_hash_entry(hash, token, value_copy)) + if (!insert_hash_entry(hash, getStringCopy(token), value_copy)) + Error(ERR_EXIT, "cannot insert into hash -- aborting"); +} + +#if 0 +#ifdef DEBUG +static void printSetupFileHash(SetupFileHash *hash) +{ + BEGIN_HASH_ITERATION(hash, itr) + { + printf("token: '%s'\n", HASH_ITERATION_TOKEN(itr)); + printf("value: '%s'\n", HASH_ITERATION_VALUE(itr)); + } + END_HASH_ITERATION(hash, itr) } #endif +#endif -struct SetupFileList *loadSetupFileList(char *filename) +static void *loadSetupFileData(char *filename, boolean use_hash) { int line_len; char line[MAX_LINE_LEN]; char *token, *value, *line_ptr; - struct SetupFileList *setup_file_list = newSetupFileList("", ""); - struct SetupFileList *first_valid_list_entry; - + void *setup_file_data, *insert_ptr; 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); @@ -903,47 +1334,57 @@ struct SetupFileList *loadSetupFileList(char *filename) break; if (*token && *value) - setTokenValue(setup_file_list, token, value); + { + if (use_hash) + setHashEntry((SetupFileHash *)setup_file_data, token, value); + else + insert_ptr = setListEntry((SetupFileList *)insert_ptr, token, value); + } } fclose(file); - first_valid_list_entry = setup_file_list->next; + if (use_hash) + { + if (hashtable_count((SetupFileHash *)setup_file_data) == 0) + Error(ERR_WARN, "configuration file '%s' is empty", filename); + } + else + { + SetupFileList *setup_file_list = (SetupFileList *)setup_file_data; + SetupFileList *first_valid_list_entry = setup_file_list->next; - /* free empty list header */ - setup_file_list->next = NULL; - freeSetupFileList(setup_file_list); + /* free empty list header */ + setup_file_list->next = NULL; + freeSetupFileList(setup_file_list); + setup_file_data = first_valid_list_entry; - if (first_valid_list_entry == NULL) - Error(ERR_WARN, "configuration file '%s' is empty", filename); + if (first_valid_list_entry == NULL) + Error(ERR_WARN, "configuration file '%s' is empty", filename); + } - return first_valid_list_entry; + return setup_file_data; } -void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, - char *identifier) +SetupFileList *loadSetupFileList(char *filename) { - if (!setup_file_list) - return; + return (SetupFileList *)loadSetupFileData(filename, FALSE); +} - if (strcmp(setup_file_list->token, TOKEN_STR_FILE_IDENTIFIER) == 0) - { - if (strcmp(setup_file_list->value, identifier) != 0) - { - Error(ERR_WARN, "configuration file has wrong version"); - return; - } - else - return; - } +SetupFileHash *loadSetupFileHash(char *filename) +{ + return (SetupFileHash *)loadSetupFileData(filename, TRUE); +} - if (setup_file_list->next) - checkSetupFileListIdentifier(setup_file_list->next, identifier); - else - { - Error(ERR_WARN, "configuration file has no version information"); - return; - } +void checkSetupFileHashIdentifier(SetupFileHash *setup_file_hash, + char *identifier) +{ + char *value = getHashEntry(setup_file_hash, TOKEN_STR_FILE_IDENTIFIER); + + if (value == NULL) + Error(ERR_WARN, "configuration file has no file identifier"); + else if (!checkCookieString(value, identifier)) + Error(ERR_WARN, "configuration file has wrong file identifier"); } @@ -954,159 +1395,159 @@ void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, #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_PLAYER_PREFIX "player_" - -/* global setup */ -#define SETUP_TOKEN_PLAYER_NAME 0 -#define SETUP_TOKEN_SOUND 1 -#define SETUP_TOKEN_SOUND_LOOPS 2 -#define SETUP_TOKEN_SOUND_MUSIC 3 -#define SETUP_TOKEN_SOUND_SIMPLE 4 -#define SETUP_TOKEN_SCROLL_DELAY 5 -#define SETUP_TOKEN_SOFT_SCROLLING 6 -#define SETUP_TOKEN_FADING 7 -#define SETUP_TOKEN_AUTORECORD 8 -#define SETUP_TOKEN_QUICK_DOORS 9 -#define SETUP_TOKEN_TEAM_MODE 10 -#define SETUP_TOKEN_HANDICAP 11 -#define SETUP_TOKEN_TIME_LIMIT 12 -#define SETUP_TOKEN_FULLSCREEN 13 - -/* player setup */ -#define SETUP_TOKEN_USE_JOYSTICK 0 -#define SETUP_TOKEN_JOY_DEVICE_NAME 1 -#define SETUP_TOKEN_JOY_XLEFT 2 -#define SETUP_TOKEN_JOY_XMIDDLE 3 -#define SETUP_TOKEN_JOY_XRIGHT 4 -#define SETUP_TOKEN_JOY_YUPPER 5 -#define SETUP_TOKEN_JOY_YMIDDLE 6 -#define SETUP_TOKEN_JOY_YLOWER 7 -#define SETUP_TOKEN_JOY_SNAP 8 -#define SETUP_TOKEN_JOY_BOMB 9 -#define SETUP_TOKEN_KEY_LEFT 10 -#define SETUP_TOKEN_KEY_RIGHT 11 -#define SETUP_TOKEN_KEY_UP 12 -#define SETUP_TOKEN_KEY_DOWN 13 -#define SETUP_TOKEN_KEY_SNAP 14 -#define SETUP_TOKEN_KEY_BOMB 15 /* 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 #define LEVELINFO_TOKEN_LEVELS 5 #define LEVELINFO_TOKEN_FIRST_LEVEL 6 #define LEVELINFO_TOKEN_SORT_PRIORITY 7 -#define LEVELINFO_TOKEN_LEVEL_GROUP 8 -#define LEVELINFO_TOKEN_READONLY 9 - -#define FIRST_GLOBAL_SETUP_TOKEN SETUP_TOKEN_PLAYER_NAME -#define LAST_GLOBAL_SETUP_TOKEN SETUP_TOKEN_FULLSCREEN - -#define FIRST_PLAYER_SETUP_TOKEN SETUP_TOKEN_USE_JOYSTICK -#define LAST_PLAYER_SETUP_TOKEN SETUP_TOKEN_KEY_BOMB - -#define FIRST_LEVELINFO_TOKEN LEVELINFO_TOKEN_NAME -#define LAST_LEVELINFO_TOKEN LEVELINFO_TOKEN_READONLY - -static struct SetupInfo si; -static struct SetupInputInfo sii; -static struct LevelDirInfo ldi; -static struct TokenInfo global_setup_tokens[] = -{ - /* global setup */ - { TYPE_STRING, &si.player_name, "player_name" }, - { TYPE_SWITCH, &si.sound, "sound" }, - { TYPE_SWITCH, &si.sound_loops, "repeating_sound_loops" }, - { TYPE_SWITCH, &si.sound_music, "background_music" }, - { TYPE_SWITCH, &si.sound_simple, "simple_sound_effects" }, - { TYPE_SWITCH, &si.scroll_delay, "scroll_delay" }, - { TYPE_SWITCH, &si.soft_scrolling, "soft_scrolling" }, - { TYPE_SWITCH, &si.fading, "screen_fading" }, - { TYPE_SWITCH, &si.autorecord, "automatic_tape_recording" }, - { TYPE_SWITCH, &si.quick_doors, "quick_doors" }, - { TYPE_SWITCH, &si.team_mode, "team_mode" }, - { TYPE_SWITCH, &si.handicap, "handicap" }, - { TYPE_SWITCH, &si.time_limit, "time_limit" }, - { TYPE_SWITCH, &si.fullscreen, "fullscreen" } -}; +#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 -static struct TokenInfo player_setup_tokens[] = -{ - /* player setup */ - { TYPE_BOOLEAN, &sii.use_joystick, ".use_joystick" }, - { TYPE_STRING, &sii.joy.device_name, ".joy.device_name" }, - { TYPE_INTEGER, &sii.joy.xleft, ".joy.xleft" }, - { TYPE_INTEGER, &sii.joy.xmiddle, ".joy.xmiddle" }, - { TYPE_INTEGER, &sii.joy.xright, ".joy.xright" }, - { TYPE_INTEGER, &sii.joy.yupper, ".joy.yupper" }, - { TYPE_INTEGER, &sii.joy.ymiddle, ".joy.ymiddle" }, - { TYPE_INTEGER, &sii.joy.ylower, ".joy.ylower" }, - { TYPE_INTEGER, &sii.joy.snap, ".joy.snap_field" }, - { TYPE_INTEGER, &sii.joy.bomb, ".joy.place_bomb" }, - { TYPE_KEY, &sii.key.left, ".key.move_left" }, - { TYPE_KEY, &sii.key.right, ".key.move_right" }, - { TYPE_KEY, &sii.key.up, ".key.move_up" }, - { TYPE_KEY, &sii.key.down, ".key.move_down" }, - { TYPE_KEY, &sii.key.snap, ".key.snap_field" }, - { TYPE_KEY, &sii.key.bomb, ".key.place_bomb" } -}; +#define NUM_LEVELINFO_TOKENS 14 + +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.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" } }; -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; + ldi->identifier = NULL; ldi->name = getStringCopy(ANONYMOUS_NAME); - 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->latest_engine = FALSE; /* default: get from level */ 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->graphics_set = NULL; + ldi->sounds_set = NULL; + ldi->music_set = NULL; + ldi->graphics_path = getStringCopy(UNDEFINED_FILENAME); + ldi->sounds_path = getStringCopy(UNDEFINED_FILENAME); + ldi->music_path = getStringCopy(UNDEFINED_FILENAME); + + ldi->levels = 0; + ldi->first_level = 0; + ldi->last_level = 0; + ldi->level_group = FALSE; + ldi->handicap_level = 0; + ldi->readonly = TRUE; + } } -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_UNDEFINED); + return; } +#if 1 + /* copy all values from the parent structure */ + + ldi->type = parent->type; + + ldi->node_top = parent->node_top; + ldi->node_parent = parent; + ldi->node_group = NULL; + ldi->next = NULL; + + ldi->cl_first = -1; + ldi->cl_cursor = -1; + + ldi->filename = NULL; + ldi->fullpath = NULL; + ldi->basepath = NULL; + ldi->identifier = NULL; + ldi->name = getStringCopy(ANONYMOUS_NAME); + ldi->name_sorting = NULL; + ldi->author = getStringCopy(parent->author); + + ldi->sort_priority = parent->sort_priority; + ldi->latest_engine = parent->latest_engine; + ldi->parent_link = FALSE; + ldi->user_defined = parent->user_defined; + ldi->color = parent->color; + ldi->class_desc = getStringCopy(parent->class_desc); + + if (ldi->type == TREE_TYPE_LEVEL_DIR) + { + ldi->imported_from = getStringCopy(parent->imported_from); + + ldi->graphics_set = NULL; + ldi->sounds_set = NULL; + ldi->music_set = NULL; + ldi->graphics_path = getStringCopy(UNDEFINED_FILENAME); + ldi->sounds_path = getStringCopy(UNDEFINED_FILENAME); + ldi->music_path = getStringCopy(UNDEFINED_FILENAME); + + ldi->levels = 0; + ldi->first_level = 0; + ldi->last_level = 0; + ldi->level_group = FALSE; + ldi->handicap_level = 0; + ldi->readonly = TRUE; + } + + +#else + /* first copy all values from the parent structure ... */ *ldi = *parent; @@ -1120,66 +1561,73 @@ static void setLevelDirInfoToDefaultsFromParent(struct LevelDirInfo *ldi, 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); + 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 setSetupInfoToDefaults(struct SetupInfo *si) +static void freeTreeInfo(TreeInfo *ldi) { - int i; + if (ldi->filename) + free(ldi->filename); + if (ldi->fullpath) + free(ldi->fullpath); + if (ldi->basepath) + free(ldi->basepath); + if (ldi->identifier) + free(ldi->identifier); - si->player_name = getStringCopy(getLoginName()); - - si->sound = TRUE; - si->sound_loops = TRUE; - si->sound_music = TRUE; - si->sound_simple = TRUE; - si->toons = TRUE; - si->double_buffering = TRUE; - si->direct_draw = !si->double_buffering; - si->scroll_delay = TRUE; - si->soft_scrolling = TRUE; - si->fading = FALSE; - si->autorecord = TRUE; - si->quick_doors = FALSE; - si->team_mode = FALSE; - si->handicap = TRUE; - si->time_limit = TRUE; - si->fullscreen = FALSE; - - for (i=0; iname) + free(ldi->name); + if (ldi->name_sorting) + free(ldi->name_sorting); + if (ldi->author) + free(ldi->author); + + if (ldi->class_desc) + free(ldi->class_desc); + + if (ldi->type == TREE_TYPE_LEVEL_DIR) { - si->input[i].use_joystick = FALSE; - si->input[i].joy.device_name=getStringCopy(getDeviceNameFromJoystickNr(i)); - si->input[i].joy.xleft = JOYSTICK_XLEFT; - si->input[i].joy.xmiddle = JOYSTICK_XMIDDLE; - si->input[i].joy.xright = JOYSTICK_XRIGHT; - si->input[i].joy.yupper = JOYSTICK_YUPPER; - si->input[i].joy.ymiddle = JOYSTICK_YMIDDLE; - si->input[i].joy.ylower = JOYSTICK_YLOWER; - si->input[i].joy.snap = (i == 0 ? JOY_BUTTON_1 : 0); - si->input[i].joy.bomb = (i == 0 ? JOY_BUTTON_2 : 0); - si->input[i].key.left = (i == 0 ? DEFAULT_KEY_LEFT : KSYM_UNDEFINED); - si->input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KSYM_UNDEFINED); - si->input[i].key.up = (i == 0 ? DEFAULT_KEY_UP : KSYM_UNDEFINED); - si->input[i].key.down = (i == 0 ? DEFAULT_KEY_DOWN : KSYM_UNDEFINED); - si->input[i].key.snap = (i == 0 ? DEFAULT_KEY_SNAP : KSYM_UNDEFINED); - si->input[i].key.bomb = (i == 0 ? DEFAULT_KEY_BOMB : KSYM_UNDEFINED); + if (ldi->graphics_set) + free(ldi->graphics_set); + if (ldi->sounds_set) + free(ldi->sounds_set); + if (ldi->music_set) + free(ldi->music_set); + + if (ldi->graphics_path) + free(ldi->graphics_path); + if (ldi->sounds_path) + free(ldi->sounds_path); + if (ldi->music_path) + free(ldi->music_path); } } -static void setSetupInfo(struct TokenInfo *token_info, - int token_nr, char *token_value) +void setSetupInfo(struct TokenInfo *token_info, + int token_nr, char *token_value) { int token_type = token_info[token_nr].type; void *setup_value = token_info[token_nr].value; @@ -1192,15 +1640,19 @@ static void setSetupInfo(struct TokenInfo *token_info, { case TYPE_BOOLEAN: case TYPE_SWITCH: - *(boolean *)setup_value = get_string_boolean_value(token_value); + *(boolean *)setup_value = get_boolean_from_string(token_value); break; case TYPE_KEY: + *(Key *)setup_value = getKeyFromKeyName(token_value); + break; + + case TYPE_KEY_X11: *(Key *)setup_value = getKeyFromX11KeyName(token_value); break; case TYPE_INTEGER: - *(int *)setup_value = get_string_integer_value(token_value); + *(int *)setup_value = get_integer_from_string(token_value); break; case TYPE_STRING: @@ -1214,45 +1666,23 @@ static void setSetupInfo(struct TokenInfo *token_info, } } -static void decodeSetupFileList(struct SetupFileList *setup_file_list) +static int compareTreeInfoEntries(const void *object1, const void *object2) { - int i, pnr; - - if (!setup_file_list) - return; - - /* handle global setup values */ - si = setup; - for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++) - setSetupInfo(global_setup_tokens, i, - getTokenValue(setup_file_list, global_setup_tokens[i].text)); - setup = si; + const TreeInfo *entry1 = *((TreeInfo **)object1); + const TreeInfo *entry2 = *((TreeInfo **)object2); + int class_sorting1, class_sorting2; + int compare_result; - /* handle player specific setup values */ - for (pnr=0; pnrtype == TREE_TYPE_LEVEL_DIR) { - char prefix[30]; - - sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, pnr + 1); - - sii = setup.input[pnr]; - for (i=FIRST_PLAYER_SETUP_TOKEN; i<=LAST_PLAYER_SETUP_TOKEN; i++) - { - char full_token[100]; - - sprintf(full_token, "%s%s", prefix, player_setup_tokens[i].text); - setSetupInfo(player_setup_tokens, i, - getTokenValue(setup_file_list, full_token)); - } - setup.input[pnr] = sii; + class_sorting1 = LEVELSORTING(entry1); + class_sorting2 = LEVELSORTING(entry2); + } + else + { + class_sorting1 = ARTWORKSORTING(entry1); + class_sorting2 = ARTWORKSORTING(entry2); } -} - -static int compareLevelDirInfoEntries(const void *object1, const void *object2) -{ - const struct LevelDirInfo *entry1 = *((struct LevelDirInfo **)object1); - const struct LevelDirInfo *entry2 = *((struct LevelDirInfo **)object2); - int compare_result; if (entry1->parent_link || entry2->parent_link) compare_result = (entry1->parent_link ? -1 : +1); @@ -1266,38 +1696,176 @@ static int compareLevelDirInfoEntries(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; } -static void createParentLevelDirNode(struct LevelDirInfo *node_parent) +static void createParentTreeInfoNode(TreeInfo *node_parent) +{ + TreeInfo *ti_new; + + if (node_parent == NULL) + return; + + ti_new = newTreeInfo(); + setTreeInfoToDefaults(ti_new, node_parent->type); + + ti_new->node_parent = node_parent; + ti_new->parent_link = TRUE; + +#if 1 + setString(&ti_new->identifier, node_parent->identifier); + setString(&ti_new->name, ".. (parent directory)"); + setString(&ti_new->name_sorting, ti_new->name); + + setString(&ti_new->filename, ".."); + setString(&ti_new->fullpath, node_parent->fullpath); + + ti_new->sort_priority = node_parent->sort_priority; + 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->filename = ".."; + 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); +} + +/* forward declaration for recursive call by "LoadLevelInfoFromLevelDir()" */ +static void LoadLevelInfoFromLevelDir(TreeInfo **, TreeInfo *, char *); + +static boolean LoadLevelInfoFromLevelConf(TreeInfo **node_first, + TreeInfo *node_parent, + char *level_directory, + char *directory_name) { - struct LevelDirInfo *leveldir_new = newLevelDirInfo(); + char *directory_path = getPath2(level_directory, directory_name); + char *filename = getPath2(directory_path, LEVELINFO_FILENAME); + SetupFileHash *setup_file_hash = loadSetupFileHash(filename); + LevelDirTree *leveldir_new = NULL; + int i; + + if (setup_file_hash == NULL) + { + Error(ERR_WARN, "ignoring level directory '%s'", directory_path); + + free(directory_path); + free(filename); + + return FALSE; + } + + leveldir_new = newTreeInfo(); + + if (node_parent) + setTreeInfoToDefaultsFromParent(leveldir_new, node_parent); + else + setTreeInfoToDefaults(leveldir_new, TREE_TYPE_LEVEL_DIR); + + leveldir_new->filename = getStringCopy(directory_name); + + checkSetupFileHashIdentifier(setup_file_hash, getCookie("LEVELINFO")); + + /* set all structure fields according to the token/value pairs */ + ldi = *leveldir_new; + for (i=0; iname, ANONYMOUS_NAME) == 0) + setString(&leveldir_new->name, leveldir_new->filename); +#else + if (strcmp(leveldir_new->name, ANONYMOUS_NAME) == 0) + { + free(leveldir_new->name); + leveldir_new->name = getStringCopy(leveldir_new->filename); + } +#endif + + DrawInitText(leveldir_new->name, 150, FC_YELLOW); + + if (leveldir_new->identifier == NULL) + leveldir_new->identifier = getStringCopy(leveldir_new->filename); - setLevelDirInfoToDefaults(leveldir_new); + if (leveldir_new->name_sorting == NULL) + leveldir_new->name_sorting = getStringCopy(leveldir_new->name); - leveldir_new->node_parent = node_parent; - leveldir_new->parent_link = TRUE; + if (node_parent == NULL) /* top level group */ + { + leveldir_new->basepath = getStringCopy(level_directory); + leveldir_new->fullpath = getStringCopy(leveldir_new->filename); + } + else /* sub level group */ + { + leveldir_new->basepath = getStringCopy(node_parent->basepath); + leveldir_new->fullpath = getPath2(node_parent->fullpath, directory_name); + } - leveldir_new->name = ".. (parent directory)"; - leveldir_new->name_short = getStringCopy(leveldir_new->name); - leveldir_new->name_sorting = getStringCopy(leveldir_new->name); + if (leveldir_new->levels < 1) + leveldir_new->levels = 1; - leveldir_new->filename = ".."; - leveldir_new->fullpath = getStringCopy(node_parent->fullpath); + leveldir_new->last_level = + leveldir_new->first_level + leveldir_new->levels - 1; - leveldir_new->sort_priority = node_parent->sort_priority; +#if 1 + leveldir_new->user_defined = + (strcmp(leveldir_new->basepath, options.level_directory) != 0); +#else + leveldir_new->user_defined = + (leveldir_new->basepath == options.level_directory ? FALSE : TRUE); +#endif + + leveldir_new->color = LEVELCOLOR(leveldir_new); +#if 1 + setString(&leveldir_new->class_desc, getLevelClassDescription(leveldir_new)); +#else leveldir_new->class_desc = getLevelClassDescription(leveldir_new); +#endif + + leveldir_new->handicap_level = /* set handicap to default value */ + (leveldir_new->user_defined ? + leveldir_new->last_level : + leveldir_new->first_level); + + pushTreeInfo(node_first, leveldir_new); + + freeSetupFileHash(setup_file_hash); + + if (leveldir_new->level_group) + { + /* create node to link back to current level directory */ + createParentTreeInfoNode(leveldir_new); + + /* step into sub-directory and look for more level series */ + LoadLevelInfoFromLevelDir(&leveldir_new->node_group, + leveldir_new, directory_path); + } - pushLevelDirInfo(&node_parent->node_group, leveldir_new); + free(directory_path); + free(filename); + + return TRUE; } -static void LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first, - struct LevelDirInfo *node_parent, +static void LoadLevelInfoFromLevelDir(TreeInfo **node_first, + TreeInfo *node_parent, char *level_directory) { DIR *dir; @@ -1312,11 +1880,9 @@ static void LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first, while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ { - struct SetupFileList *setup_file_list = NULL; struct stat file_status; char *directory_name = dir_entry->d_name; char *directory_path = getPath2(level_directory, directory_name); - char *filename = NULL; /* skip entries for current and parent directory */ if (strcmp(directory_name, ".") == 0 || @@ -1334,115 +1900,520 @@ static void LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first, continue; } - filename = getPath2(directory_path, LEVELINFO_FILENAME); - setup_file_list = loadSetupFileList(filename); - - if (setup_file_list) - { - struct LevelDirInfo *leveldir_new = newLevelDirInfo(); - int i; + free(directory_path); - checkSetupFileListIdentifier(setup_file_list, LEVELINFO_COOKIE); - setLevelDirInfoToDefaultsFromParent(leveldir_new, node_parent); + if (strcmp(directory_name, GRAPHICS_DIRECTORY) == 0 || + strcmp(directory_name, SOUNDS_DIRECTORY) == 0 || + strcmp(directory_name, MUSIC_DIRECTORY) == 0) + continue; - /* set all structure fields according to the token/value pairs */ - ldi = *leveldir_new; - for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++) - setSetupInfo(levelinfo_tokens, i, - getTokenValue(setup_file_list, levelinfo_tokens[i].text)); - *leveldir_new = ldi; + valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent, + level_directory, + directory_name); + } - DrawInitText(leveldir_new->name, 150, FC_YELLOW); + closedir(dir); - if (leveldir_new->name_short == NULL) - leveldir_new->name_short = getStringCopy(leveldir_new->name); + if (!valid_entry_found) + { + /* check if this directory directly contains a file "levelinfo.conf" */ + valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent, + level_directory, "."); + } - if (leveldir_new->name_sorting == NULL) - leveldir_new->name_sorting = getStringCopy(leveldir_new->name); + if (!valid_entry_found) + Error(ERR_WARN, "cannot find any valid level series in directory '%s'", + level_directory); +} - leveldir_new->filename = getStringCopy(directory_name); +void LoadLevelInfo() +{ + InitUserLevelDirectory(getLoginName()); - if (node_parent == NULL) /* top level group */ - { - leveldir_new->basepath = level_directory; - leveldir_new->fullpath = leveldir_new->filename; - } - else /* sub level group */ + DrawInitText("Loading level series:", 120, FC_GREEN); + + LoadLevelInfoFromLevelDir(&leveldir_first, NULL, options.level_directory); + LoadLevelInfoFromLevelDir(&leveldir_first, NULL, getUserLevelDir(NULL)); + + /* 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"); + + sortTreeInfo(&leveldir_first, compareTreeInfoEntries); + +#if 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, ARTWORKINFO_FILENAME(type)); + SetupFileHash *setup_file_hash = NULL; + TreeInfo *artwork_new = NULL; + int i; + + if (access(filename, F_OK) == 0) /* file exists */ + setup_file_hash = loadSetupFileHash(filename); + + if (setup_file_hash == 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) { - leveldir_new->basepath = node_parent->basepath; - leveldir_new->fullpath = getPath2(node_parent->fullpath, - directory_name); + char *entry_name = dir_entry->d_name; + + if (FileIsArtworkType(entry_name, type)) + { + valid_file_found = TRUE; + break; + } } - if (leveldir_new->levels < 1) - leveldir_new->levels = 1; + closedir(dir); + } - leveldir_new->last_level = - leveldir_new->first_level + leveldir_new->levels - 1; + if (!valid_file_found) + { + if (strcmp(directory_name, ".") != 0) + Error(ERR_WARN, "ignoring artwork directory '%s'", directory_path); - leveldir_new->user_defined = - (leveldir_new->basepath == options.level_directory ? FALSE : TRUE); + free(directory_path); + free(filename); - leveldir_new->color = LEVELCOLOR(leveldir_new); - leveldir_new->class_desc = getLevelClassDescription(leveldir_new); + return FALSE; + } + } - leveldir_new->handicap_level = /* set handicap to default value */ - (leveldir_new->user_defined ? - leveldir_new->last_level : - leveldir_new->first_level); + artwork_new = newTreeInfo(); - pushLevelDirInfo(node_first, leveldir_new); + if (node_parent) + setTreeInfoToDefaultsFromParent(artwork_new, node_parent); + else + setTreeInfoToDefaults(artwork_new, type); - freeSetupFileList(setup_file_list); - valid_entry_found = TRUE; + artwork_new->filename = getStringCopy(directory_name); - if (leveldir_new->level_group) - { - /* create node to link back to current level directory */ - createParentLevelDirNode(leveldir_new); + if (setup_file_hash) /* (before defining ".color" and ".class_desc") */ + { +#if 0 + checkSetupFileHashIdentifier(setup_file_hash, getCookie("...")); +#endif + + /* set all structure fields according to the token/value pairs */ + ldi = *artwork_new; + for (i=0; iname, ANONYMOUS_NAME) == 0) + setString(&artwork_new->name, artwork_new->filename); +#else + if (strcmp(artwork_new->name, ANONYMOUS_NAME) == 0) + { + free(artwork_new->name); + artwork_new->name = getStringCopy(artwork_new->filename); + } +#endif + +#if 0 + DrawInitText(artwork_new->name, 150, FC_YELLOW); +#endif + + 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); + } + + if (node_parent == NULL) /* top level group */ + { + artwork_new->basepath = getStringCopy(base_directory); + artwork_new->fullpath = getStringCopy(artwork_new->filename); + } + else /* sub level group */ + { + artwork_new->basepath = getStringCopy(node_parent->basepath); + artwork_new->fullpath = getPath2(node_parent->fullpath, directory_name); + } + +#if 1 + artwork_new->user_defined = + (strcmp(artwork_new->basepath, OPTIONS_ARTWORK_DIRECTORY(type)) != 0); +#else + artwork_new->user_defined = + (artwork_new->basepath == OPTIONS_ARTWORK_DIRECTORY(type) ? FALSE : TRUE); +#endif + + /* (may use ".sort_priority" from "setup_file_hash" above) */ + artwork_new->color = ARTWORKCOLOR(artwork_new); +#if 1 + setString(&artwork_new->class_desc, getLevelClassDescription(artwork_new)); +#else + artwork_new->class_desc = getLevelClassDescription(artwork_new); +#endif + + if (setup_file_hash == NULL) /* (after determining ".user_defined") */ + { +#if 0 + if (artwork_new->name != NULL) + { + free(artwork_new->name); + artwork_new->name = NULL; + } +#endif - /* step into sub-directory and look for more level series */ - LoadLevelInfoFromLevelDir(&leveldir_new->node_group, - leveldir_new, directory_path); +#if 0 + if (artwork_new->identifier != NULL) + { + free(artwork_new->identifier); + artwork_new->identifier = NULL; + } +#endif + + if (strcmp(artwork_new->filename, ".") == 0) + { + if (artwork_new->user_defined) + { +#if 1 + setString(&artwork_new->identifier, "private"); +#else + artwork_new->identifier = getStringCopy("private"); +#endif + artwork_new->sort_priority = ARTWORKCLASS_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 - Error(ERR_WARN, "ignoring level directory '%s'", directory_path); + { +#if 1 + setString(&artwork_new->identifier, artwork_new->filename); +#else + artwork_new->identifier = getStringCopy(artwork_new->filename); +#endif + } + +#if 1 + setString(&artwork_new->name, artwork_new->identifier); + setString(&artwork_new->name_sorting, artwork_new->name); +#else + artwork_new->name = getStringCopy(artwork_new->identifier); + artwork_new->name_sorting = getStringCopy(artwork_new->name); +#endif + } + + DrawInitText(artwork_new->name, 150, FC_YELLOW); + + pushTreeInfo(node_first, artwork_new); + + freeSetupFileHash(setup_file_hash); + + 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 (base_directory == OPTIONS_ARTWORK_DIRECTORY(type)) + 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); - free(filename); + + /* 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 level series in directory '%s'", - level_directory); + Error(ERR_WARN, "cannot find any valid artwork in directory '%s'", + base_directory); } -void LoadLevelInfo() +static TreeInfo *getDummyArtworkInfo(int type) { - InitUserLevelDirectory(getLoginName()); + /* this is only needed when there is completely no artwork available */ + TreeInfo *artwork_new = newTreeInfo(); - DrawInitText("Loading level series:", 120, FC_GREEN); + setTreeInfoToDefaults(artwork_new, type); - LoadLevelInfoFromLevelDir(&leveldir_first, NULL, options.level_directory); - LoadLevelInfoFromLevelDir(&leveldir_first, NULL, getUserLevelDir("")); +#if 1 + setString(&artwork_new->filename, UNDEFINED_FILENAME); + setString(&artwork_new->fullpath, UNDEFINED_FILENAME); + setString(&artwork_new->basepath, UNDEFINED_FILENAME); - leveldir_current = getFirstValidLevelSeries(leveldir_first); + setString(&artwork_new->identifier, UNDEFINED_FILENAME); + setString(&artwork_new->name, UNDEFINED_FILENAME); + setString(&artwork_new->name_sorting, UNDEFINED_FILENAME); +#else + artwork_new->filename = getStringCopy(UNDEFINED_FILENAME); + artwork_new->fullpath = getStringCopy(UNDEFINED_FILENAME); + artwork_new->basepath = getStringCopy(UNDEFINED_FILENAME); - if (leveldir_first == NULL) - Error(ERR_EXIT, "cannot find any valid level series in any directory"); + if (artwork_new->name != NULL) + 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; +} + +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); + + if (artwork.gfx_first == NULL) + artwork.gfx_first = getDummyArtworkInfo(TREE_TYPE_GRAPHICS_DIR); + if (artwork.snd_first == NULL) + artwork.snd_first = getDummyArtworkInfo(TREE_TYPE_SOUNDS_DIR); + if (artwork.mus_first == NULL) + artwork.mus_first = getDummyArtworkInfo(TREE_TYPE_MUSIC_DIR); + + /* before sorting, the first entries will be from the user directory */ + artwork.gfx_current = + getTreeInfoFromIdentifier(artwork.gfx_first, setup.graphics_set); + if (artwork.gfx_current == NULL) + artwork.gfx_current = + getTreeInfoFromIdentifier(artwork.gfx_first, GFX_CLASSIC_SUBDIR); + if (artwork.gfx_current == NULL) + artwork.gfx_current = getFirstValidTreeInfoEntry(artwork.gfx_first); + + artwork.snd_current = + getTreeInfoFromIdentifier(artwork.snd_first, setup.sounds_set); + if (artwork.snd_current == NULL) + artwork.snd_current = + getTreeInfoFromIdentifier(artwork.snd_first, SND_CLASSIC_SUBDIR); + if (artwork.snd_current == NULL) + artwork.snd_current = getFirstValidTreeInfoEntry(artwork.snd_first); + + artwork.mus_current = + getTreeInfoFromIdentifier(artwork.mus_first, setup.music_set); + if (artwork.mus_current == NULL) + artwork.mus_current = + getTreeInfoFromIdentifier(artwork.mus_first, MUS_CLASSIC_SUBDIR); + if (artwork.mus_current == NULL) + artwork.mus_current = getFirstValidTreeInfoEntry(artwork.mus_first); + + 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.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); + 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 +} - sortLevelDirInfo(&leveldir_first, compareLevelDirInfoEntries); +void LoadArtworkInfoFromLevelInfo(ArtworkDirTree **artwork_node, + LevelDirTree *level_node) +{ + /* recursively check all level directories for artwork sub-directories */ + + while (level_node) + { + char *path = getPath2(getLevelDirFromTreeInfo(level_node), + ARTWORK_DIRECTORY((*artwork_node)->type)); #if 0 - dumpLevelDirInfo(leveldir_first, 0); + if (!level_node->parent_link) + printf("CHECKING '%s' ['%s', '%s'] ...\n", path, + level_node->filename, level_node->name); +#endif + + if (!level_node->parent_link) + { + TreeInfo *topnode_last = *artwork_node; + + LoadArtworkInfoFromArtworkDir(artwork_node, NULL, path, + (*artwork_node)->type); + + if (topnode_last != *artwork_node) + { + free((*artwork_node)->identifier); + free((*artwork_node)->name); + free((*artwork_node)->name_sorting); + + (*artwork_node)->identifier = getStringCopy(level_node->filename); + (*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); + + if (level_node->node_group != NULL) + LoadArtworkInfoFromLevelInfo(artwork_node, level_node->node_group); + + level_node = level_node->next; + } +} + +void LoadLevelArtworkInfo() +{ + DrawInitText("Looking for custom level artwork:", 120, FC_GREEN); + + LoadArtworkInfoFromLevelInfo(&artwork.gfx_first, leveldir_first); + LoadArtworkInfoFromLevelInfo(&artwork.snd_first, leveldir_first); + LoadArtworkInfoFromLevelInfo(&artwork.mus_first, leveldir_first); + + /* needed for reloading level artwork not known at ealier stage */ + + if (strcmp(artwork.gfx_current_identifier, setup.graphics_set) != 0) + { + artwork.gfx_current = + getTreeInfoFromIdentifier(artwork.gfx_first, setup.graphics_set); + if (artwork.gfx_current == NULL) + artwork.gfx_current = + getTreeInfoFromIdentifier(artwork.gfx_first, GFX_CLASSIC_SUBDIR); + 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 = + getTreeInfoFromIdentifier(artwork.snd_first, SND_CLASSIC_SUBDIR); + 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 = + getTreeInfoFromIdentifier(artwork.mus_first, MUS_CLASSIC_SUBDIR); + 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); + +#if 0 + dumpTreeInfo(artwork.gfx_first, 0); + dumpTreeInfo(artwork.snd_first, 0); + dumpTreeInfo(artwork.mus_first, 0); #endif } static void SaveUserLevelInfo() { + LevelDirTree *level_info; char *filename; FILE *file; int i; @@ -1456,211 +2427,161 @@ static void SaveUserLevelInfo() return; } - /* always start with reliable default values */ - setLevelDirInfoToDefaults(&ldi); + level_info = newTreeInfo(); - ldi.name = getLoginName(); - ldi.author = getRealName(); + /* 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_USER_START; + 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 - fprintf(file, "%s\n\n", - getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, LEVELINFO_COOKIE)); + fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, + getCookie("LEVELINFO"))); - for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++) - if (i != LEVELINFO_TOKEN_NAME_SHORT && + ldi = *level_info; + for (i=0; i MAX_PLAYER_NAME_LEN) - setup.player_name[MAX_PLAYER_NAME_LEN] = '\0'; - else if (strlen(setup.player_name) < MAX_PLAYER_NAME_LEN) - { - char *new_name = checked_malloc(MAX_PLAYER_NAME_LEN + 1); - - strcpy(new_name, setup.player_name); - free(setup.player_name); - setup.player_name = new_name; - } - } - else - Error(ERR_WARN, "using default setup values"); + freeTreeInfo(level_info); free(filename); } -static 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 */ /* ----------------------------------------------------------------------- */ filename = getPath2(getSetupDir(), LEVELSETUP_FILENAME); - if ((level_setup_list = loadSetupFileList(filename))) + if ((level_setup_hash = loadSetupFileHash(filename))) { char *last_level_series = - getTokenValue(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES); + getHashEntry(level_setup_hash, TOKEN_STR_LAST_LEVEL_SERIES); - leveldir_current = getLevelDirInfoFromFilename(last_level_series); + leveldir_current = getTreeInfoFromIdentifier(leveldir_first, + last_level_series); if (leveldir_current == NULL) - leveldir_current = leveldir_first; + leveldir_current = getFirstValidTreeInfoEntry(leveldir_first); - checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE); + checkSetupFileHashIdentifier(level_setup_hash, getCookie("LEVELSETUP")); - freeSetupFileList(level_setup_list); + freeSetupFileHash(level_setup_hash); } else Error(ERR_WARN, "using default setup values"); @@ -1675,7 +2596,7 @@ void SaveLevelSetup_LastSeries() FILE *file; /* ----------------------------------------------------------------------- */ - /* ~/.rocksndiamonds/levelsetup.conf */ + /* ~/./levelsetup.conf */ /* ----------------------------------------------------------------------- */ InitUserDataDirectory(); @@ -1690,14 +2611,15 @@ void SaveLevelSetup_LastSeries() } fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, - LEVELSETUP_COOKIE)); + getCookie("LEVELSETUP"))); fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_LAST_LEVEL_SERIES, level_subdir)); fclose(file); - free(filename); SetFilePermissions(filename, PERMS_PRIVATE); + + free(filename); } static void checkSeriesInfo() @@ -1709,7 +2631,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); @@ -1733,6 +2655,7 @@ static void checkSeriesInfo() levelnum_value = atoi(levelnum_str); +#if 0 if (levelnum_value < leveldir_current->first_level) { Error(ERR_WARN, "additional level %d found", levelnum_value); @@ -1743,6 +2666,7 @@ static void checkSeriesInfo() Error(ERR_WARN, "additional level %d found", levelnum_value); leveldir_current->last_level = levelnum_value; } +#endif } } @@ -1752,7 +2676,7 @@ static void checkSeriesInfo() void LoadLevelSetup_SeriesInfo() { char *filename; - struct SetupFileList *level_setup_list = NULL; + SetupFileHash *level_setup_hash = NULL; char *level_subdir = leveldir_current->filename; /* always start with reliable default values */ @@ -1761,18 +2685,18 @@ void LoadLevelSetup_SeriesInfo() checkSeriesInfo(leveldir_current); /* ----------------------------------------------------------------------- */ - /* ~/.rocksndiamonds/levelsetup//levelsetup.conf */ + /* ~/./levelsetup//levelsetup.conf */ /* ----------------------------------------------------------------------- */ level_subdir = leveldir_current->filename; filename = getPath2(getLevelSetupDir(level_subdir), LEVELSETUP_FILENAME); - if ((level_setup_list = loadSetupFileList(filename))) + if ((level_setup_hash = loadSetupFileHash(filename))) { char *token_value; - token_value = getTokenValue(level_setup_list, TOKEN_STR_LAST_PLAYED_LEVEL); + token_value = getHashEntry(level_setup_hash, TOKEN_STR_LAST_PLAYED_LEVEL); if (token_value) { @@ -1784,7 +2708,7 @@ void LoadLevelSetup_SeriesInfo() level_nr = leveldir_current->last_level; } - token_value = getTokenValue(level_setup_list, TOKEN_STR_HANDICAP_LEVEL); + token_value = getHashEntry(level_setup_hash, TOKEN_STR_HANDICAP_LEVEL); if (token_value) { @@ -1801,9 +2725,9 @@ void LoadLevelSetup_SeriesInfo() leveldir_current->handicap_level = level_nr; } - checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE); + checkSetupFileHashIdentifier(level_setup_hash, getCookie("LEVELSETUP")); - freeSetupFileList(level_setup_list); + freeSetupFileHash(level_setup_hash); } else Error(ERR_WARN, "using default setup values"); @@ -1820,7 +2744,7 @@ void SaveLevelSetup_SeriesInfo() FILE *file; /* ----------------------------------------------------------------------- */ - /* ~/.rocksndiamonds/levelsetup//levelsetup.conf */ + /* ~/./levelsetup//levelsetup.conf */ /* ----------------------------------------------------------------------- */ InitLevelSetupDirectory(level_subdir); @@ -1835,14 +2759,15 @@ void SaveLevelSetup_SeriesInfo() } fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, - LEVELSETUP_COOKIE)); + getCookie("LEVELSETUP"))); fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_LAST_PLAYED_LEVEL, level_nr_str)); fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_HANDICAP_LEVEL, handicap_level_str)); fclose(file); - free(filename); SetFilePermissions(filename, PERMS_PRIVATE); + + free(filename); }