X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=fefe33dfbd0dfa074578769eb7d865371ce4b9ee;hb=f1685723f2d920b7d7349c57e902c7adfaffdb1c;hp=d0f2bc06d7c72db48bbe8a97ff2b98f0819de6fd;hpb=41e8d55b767c898f20c29a1b0b8d2ef8840be2f5;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index d0f2bc06..fefe33df 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -21,18 +21,15 @@ #include "text.h" #include "misc.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 GRAPHICSINFO_FILENAME "graphicsinfo.conf" +#define SOUNDSINFO_FILENAME "soundsinfo.conf" +#define MUSICINFO_FILENAME "musicinfo.conf" #define LEVELFILE_EXTENSION "level" #define TAPEFILE_EXTENSION "tape" #define SCOREFILE_EXTENSION "score" @@ -41,6 +38,9 @@ #define SETUP_FILENAME "setup.cnf" #define LEVELSETUP_FILENAME "lvlsetup.cnf" #define LEVELINFO_FILENAME "lvlinfo.cnf" +#define GRAPHICSINFO_FILENAME "gfxinfo.cnf" +#define SOUNDSINFO_FILENAME "sndinfo.cnf" +#define MUSICINFO_FILENAME "musinfo.cnf" #define LEVELFILE_EXTENSION "lvl" #define TAPEFILE_EXTENSION "tap" #define SCOREFILE_EXTENSION "sco" @@ -79,47 +79,16 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] = IS_LEVELCLASS_USER(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 TOKEN_VALUE_POSITION 30 -struct SetupFileList -{ - char *token; - char *value; - struct SetupFileList *next; -}; - -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 +98,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 +107,7 @@ static char *getUserLevelDir(char *level_subdir) if (userlevel_dir) free(userlevel_dir); - if (strlen(level_subdir) > 0) + if (level_subdir != NULL) userlevel_dir = getPath3(data_dir, userlevel_subdir, level_subdir); else userlevel_dir = getPath2(data_dir, userlevel_subdir); @@ -161,7 +124,7 @@ static char *getTapeDir(char *level_subdir) if (tape_dir) free(tape_dir); - if (strlen(level_subdir) > 0) + if (level_subdir != NULL) tape_dir = getPath3(data_dir, tape_subdir, level_subdir); else tape_dir = getPath2(data_dir, tape_subdir); @@ -178,7 +141,7 @@ static char *getScoreDir(char *level_subdir) if (score_dir) free(score_dir); - if (strlen(level_subdir) > 0) + if (level_subdir != NULL) score_dir = getPath3(data_dir, score_subdir, level_subdir); else score_dir = getPath2(data_dir, score_subdir); @@ -195,7 +158,7 @@ static char *getLevelSetupDir(char *level_subdir) if (levelsetup_dir) free(levelsetup_dir); - if (strlen(level_subdir) > 0) + if (level_subdir != NULL) levelsetup_dir = getPath3(data_dir, levelsetup_subdir, level_subdir); else levelsetup_dir = getPath2(data_dir, levelsetup_subdir); @@ -203,6 +166,98 @@ static char *getLevelSetupDir(char *level_subdir) return levelsetup_dir; } +static char *getCurrentLevelDir() +{ + static char *level_dir = NULL; + + if (level_dir) + free(level_dir); + + if (leveldir_current == NULL) + return options.level_directory; + + level_dir = getPath2((leveldir_current->user_defined ? + getUserLevelDir(NULL) : options.level_directory), + leveldir_current->fullpath); + + return level_dir; +} + +static char *getDefaultGraphicsDir(char *graphics_subdir) +{ + static char *graphics_dir = NULL; + + if (graphics_subdir == NULL) + return options.graphics_directory; + + if (graphics_dir) + free(graphics_dir); + + graphics_dir = getPath2(options.graphics_directory, graphics_subdir); + + return graphics_dir; +} + +static char *getDefaultSoundsDir(char *sounds_subdir) +{ + static char *sounds_dir = NULL; + + if (sounds_subdir == NULL) + return options.sounds_directory; + + if (sounds_dir) + free(sounds_dir); + + sounds_dir = getPath2(options.sounds_directory, sounds_subdir); + + return sounds_dir; +} + +static char *getDefaultMusicDir(char *music_subdir) +{ + static char *music_dir = NULL; + + if (music_subdir == NULL) + return options.music_directory; + + if (music_dir) + free(music_dir); + + music_dir = getPath2(options.music_directory, music_subdir); + + return music_dir; +} + +static char *getUserGraphicsDir() +{ + static char *usergraphics_dir = NULL; + + if (usergraphics_dir == NULL) + usergraphics_dir = getPath2(getUserDataDir(), GRAPHICS_DIRECTORY); + + return usergraphics_dir; +} + +static char *getUserSoundsDir() +{ + static char *usersounds_dir = NULL; + + if (usersounds_dir == NULL) + usersounds_dir = getPath2(getUserDataDir(), SOUNDS_DIRECTORY); + + return usersounds_dir; +} + +static char *getUserMusicDir() +{ + static char *usermusic_dir = NULL; + + if (usermusic_dir == NULL) + usermusic_dir = getPath2(getUserDataDir(), MUSIC_DIRECTORY); + + return usermusic_dir; +} + char *getLevelFilename(int nr) { static char *filename = NULL; @@ -212,11 +267,7 @@ char *getLevelFilename(int nr) free(filename); sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION); - filename = getPath3((leveldir_current->user_defined ? - getUserLevelDir("") : - options.level_directory), - leveldir_current->fullpath, - basename); + filename = getPath2(getCurrentLevelDir(), basename); return filename; } @@ -249,25 +300,184 @@ 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 *getSetupArtworkDir(TreeInfo *ti) +{ + static char *artwork_dir = NULL; + + if (artwork_dir != NULL) + free(artwork_dir); + + artwork_dir = getPath2(ti->basepath, ti->fullpath); + + return artwork_dir; +} + +static char *getCorrectedImageBasename(char *basename) +{ + char *result = basename; + +#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) + result = &basename[prefix_len]; + } +#endif + + return result; +} + +static boolean fileExists(char *filename) +{ +#if 0 + printf("checking file '%s'\n", filename); +#endif + + return (access(filename, F_OK) == 0); +} + +char *getCustomImageFilename(char *basename) +{ + static char *filename = NULL; + + if (filename != NULL) + free(filename); + + basename = getCorrectedImageBasename(basename); + + /* 1st try: look for special artwork in current level series directory */ + filename = getPath3(getCurrentLevelDir(), GRAPHICS_DIRECTORY, basename); + if (fileExists(filename)) + return filename; + + /* 2nd try: look for special artwork in private artwork directory */ + filename = getPath2(getUserGraphicsDir(), basename); + if (fileExists(filename)) + return filename; + + /* 3rd try: look for special artwork in configured artwork directory */ + filename = getPath2(getSetupArtworkDir(artwork.gfx_current), basename); + if (fileExists(filename)) + return filename; + + /* 4th try: look for default artwork in new default artwork directory */ + filename = getPath2(getDefaultGraphicsDir(GRAPHICS_SUBDIR), basename); + if (fileExists(filename)) + return filename; + + /* 5th try: look for default artwork in old default artwork directory */ + filename = getPath2(options.graphics_directory, basename); + if (fileExists(filename)) + return filename; + + return NULL; /* cannot find image file */ +} + +char *getCustomSoundFilename(char *basename) +{ + static char *filename = NULL; + + if (filename != NULL) + free(filename); + + /* 1st try: look for special artwork in current level series directory */ + filename = getPath3(getCurrentLevelDir(), SOUNDS_DIRECTORY, basename); + if (fileExists(filename)) + return filename; + + /* 2nd try: look for special artwork in private artwork directory */ + filename = getPath2(getUserSoundsDir(), basename); + if (fileExists(filename)) + return filename; + + /* 3rd try: look for special artwork in configured artwork directory */ + filename = getPath2(getSetupArtworkDir(artwork.snd_current), basename); + if (fileExists(filename)) + return filename; + + /* 4th try: look for default artwork in new default artwork directory */ + filename = getPath2(getDefaultSoundsDir(SOUNDS_SUBDIR), basename); + if (fileExists(filename)) + return filename; + + /* 5th try: look for default artwork in old default artwork directory */ + filename = getPath2(options.sounds_directory, basename); + if (fileExists(filename)) + return filename; + + return NULL; /* cannot find image file */ +} + +char *getCustomMusicDirectory(void) +{ + static char *directory = NULL; + + if (directory != NULL) + free(directory); + + /* 1st try: look for special artwork in current level series directory */ + directory = getPath2(getCurrentLevelDir(), MUSIC_DIRECTORY); + if (fileExists(directory)) + return directory; + + /* 2nd try: look for special artwork in private artwork directory */ + directory = getStringCopy(getUserMusicDir()); + if (fileExists(directory)) + return directory; + + /* 3rd try: look for special artwork in configured artwork directory */ + directory = getStringCopy(getSetupArtworkDir(artwork.mus_current)); + if (fileExists(directory)) + return directory; + + /* 4th try: look for default artwork in new default artwork directory */ + directory = getStringCopy(getDefaultMusicDir(MUSIC_SUBDIR)); + if (fileExists(directory)) + return 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 image file */ +} + void InitTapeDirectory(char *level_subdir) { createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE); - createDirectory(getTapeDir(""), "main tape", PERMS_PRIVATE); + createDirectory(getTapeDir(NULL), "main tape", PERMS_PRIVATE); createDirectory(getTapeDir(level_subdir), "level tape", PERMS_PRIVATE); } void InitScoreDirectory(char *level_subdir) { - createDirectory(getScoreDir(""), "main score", PERMS_PUBLIC); + createDirectory(getScoreDir(NULL), "main score", PERMS_PUBLIC); createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC); } +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,7 +487,7 @@ void InitUserLevelDirectory(char *level_subdir) void InitLevelSetupDirectory(char *level_subdir) { createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE); - createDirectory(getLevelSetupDir(""), "main level setup", PERMS_PRIVATE); + createDirectory(getLevelSetupDir(NULL), "main level setup", PERMS_PRIVATE); createDirectory(getLevelSetupDir(level_subdir), "level setup",PERMS_PRIVATE); } @@ -330,19 +540,18 @@ void WriteChunk_VERS(FILE *file, int file_version, int game_version) /* some functions to handle lists of level directories */ /* ------------------------------------------------------------------------- */ -struct LevelDirInfo *newLevelDirInfo() +TreeInfo *newTreeInfo() { - return checked_calloc(sizeof(struct LevelDirInfo)); + return checked_calloc(sizeof(TreeInfo)); } -void pushLevelDirInfo(struct LevelDirInfo **node_first, - struct LevelDirInfo *node_new) +void pushTreeInfo(TreeInfo **node_first, TreeInfo *node_new) { node_new->next = *node_first; *node_first = node_new; } -int numLevelDirInfo(struct LevelDirInfo *node) +int numTreeInfo(TreeInfo *node) { int num = 0; @@ -355,52 +564,52 @@ int numLevelDirInfo(struct LevelDirInfo *node) return num; } -boolean validLevelSeries(struct LevelDirInfo *node) +boolean validLevelSeries(TreeInfo *node) { return (node != NULL && !node->node_group && !node->parent_link); } -struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *node) +TreeInfo *getFirstValidTreeInfoEntry(TreeInfo *node) { if (node == NULL) { - if (leveldir_first) /* start with first level directory entry */ - return getFirstValidLevelSeries(leveldir_first); + if (node->node_top) /* start with first tree entry */ + return getFirstValidTreeInfoEntry(*node->node_top); else return NULL; } else if (node->node_group) /* enter level group (step down into tree) */ - return getFirstValidLevelSeries(node->node_group); + return getFirstValidTreeInfoEntry(node->node_group); else if (node->parent_link) /* skip start entry of level group */ { if (node->next) /* get first real level series entry */ - return getFirstValidLevelSeries(node->next); + return getFirstValidTreeInfoEntry(node->next); else /* leave empty level group and go on */ - return getFirstValidLevelSeries(node->node_parent->next); + return getFirstValidTreeInfoEntry(node->node_parent->next); } else /* this seems to be a regular level series */ return node; } -struct LevelDirInfo *getLevelDirInfoFirstGroupEntry(struct LevelDirInfo *node) +TreeInfo *getTreeInfoFirstGroupEntry(TreeInfo *node) { if (node == NULL) return NULL; if (node->node_parent == NULL) /* top level group */ - return leveldir_first; + return *node->node_top; else /* sub level group */ return node->node_parent->node_group; } -int numLevelDirInfoInGroup(struct LevelDirInfo *node) +int numTreeInfoInGroup(TreeInfo *node) { - return numLevelDirInfo(getLevelDirInfoFirstGroupEntry(node)); + return numTreeInfo(getTreeInfoFirstGroupEntry(node)); } -int posLevelDirInfo(struct LevelDirInfo *node) +int posTreeInfo(TreeInfo *node) { - struct LevelDirInfo *node_cmp = getLevelDirInfoFirstGroupEntry(node); + TreeInfo *node_cmp = getTreeInfoFirstGroupEntry(node); int pos = 0; while (node_cmp) @@ -415,9 +624,9 @@ int posLevelDirInfo(struct LevelDirInfo *node) return 0; } -struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *node, int pos) +TreeInfo *getTreeInfoFromPos(TreeInfo *node, int pos) { - struct LevelDirInfo *node_default = node; + TreeInfo *node_default = node; int pos_cmp = 0; while (node) @@ -432,8 +641,7 @@ struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *node, int pos) return node_default; } -struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node, - char *filename) +TreeInfo *getTreeInfoFromFilenameExt(TreeInfo *node, char *filename) { if (filename == NULL) return NULL; @@ -442,9 +650,9 @@ struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node, { if (node->node_group) { - struct LevelDirInfo *node_group; + TreeInfo *node_group; - node_group = getLevelDirInfoFromFilenameExt(node->node_group, filename); + node_group = getTreeInfoFromFilenameExt(node->node_group, filename); if (node_group) return node_group; @@ -461,42 +669,44 @@ struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node, return NULL; } -struct LevelDirInfo *getLevelDirInfoFromFilename(char *filename) +TreeInfo *getTreeInfoFromFilename(TreeInfo *ti, char *filename) { - return getLevelDirInfoFromFilenameExt(leveldir_first, filename); + return getTreeInfoFromFilenameExt(ti, filename); } -void dumpLevelDirInfo(struct LevelDirInfo *node, int depth) +void dumpTreeInfo(TreeInfo *node, int depth) { int i; + printf("Dumping TreeInfo:\n"); + while (node) { - for (i=0; ifilename); + printf("filename == '%s' [%s]\n", node->filename, node->name); if (node->node_group != NULL) - dumpLevelDirInfo(node->node_group, depth + 1); + dumpTreeInfo(node->node_group, depth + 1); node = node->next; } } -void sortLevelDirInfo(struct LevelDirInfo **node_first, - int (*compare_function)(const void *, const void *)) +void sortTreeInfo(TreeInfo **node_first, + int (*compare_function)(const void *, const void *)) { - int num_nodes = numLevelDirInfo(*node_first); - struct LevelDirInfo **sort_array; - struct LevelDirInfo *node = *node_first; + int num_nodes = numTreeInfo(*node_first); + TreeInfo **sort_array; + TreeInfo *node = *node_first; int i = 0; if (num_nodes == 0) return; /* allocate array for sorting structure pointers */ - sort_array = checked_calloc(num_nodes * sizeof(struct LevelDirInfo *)); + sort_array = checked_calloc(num_nodes * sizeof(TreeInfo *)); /* writing structure pointers to sorting array */ while (i < num_nodes && node) /* double boundary check... */ @@ -508,7 +718,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 +736,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; } @@ -645,6 +855,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; @@ -928,9 +1153,9 @@ void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, if (strcmp(setup_file_list->token, TOKEN_STR_FILE_IDENTIFIER) == 0) { - if (strcmp(setup_file_list->value, identifier) != 0) + if (!checkCookieString(setup_file_list->value, identifier)) { - Error(ERR_WARN, "configuration file has wrong version"); + Error(ERR_WARN, "configuration file has wrong file identifier"); return; } else @@ -941,7 +1166,7 @@ void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, checkSetupFileListIdentifier(setup_file_list->next, identifier); else { - Error(ERR_WARN, "configuration file has no version information"); + Error(ERR_WARN, "configuration file has no file identifier"); return; } } @@ -954,41 +1179,6 @@ 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 @@ -1002,75 +1192,42 @@ void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, #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 NUM_LEVELINFO_TOKENS 10 -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" } -}; +static LevelDirTree ldi; static struct TokenInfo levelinfo_tokens[] = { /* level directory info */ - { TYPE_STRING, &ldi.name, "name" }, - { TYPE_STRING, &ldi.name_short, "name_short" }, - { TYPE_STRING, &ldi.name_sorting, "name_sorting" }, - { TYPE_STRING, &ldi.author, "author" }, - { TYPE_STRING, &ldi.imported_from, "imported_from" }, - { TYPE_INTEGER, &ldi.levels, "levels" }, - { TYPE_INTEGER, &ldi.first_level, "first_level" }, - { TYPE_INTEGER, &ldi.sort_priority, "sort_priority" }, - { TYPE_BOOLEAN, &ldi.level_group, "level_group" }, - { TYPE_BOOLEAN, &ldi.readonly, "readonly" } + { TYPE_STRING, &ldi.name, "name" }, + { TYPE_STRING, &ldi.name_short, "name_short" }, + { TYPE_STRING, &ldi.name_sorting, "name_sorting" }, + { TYPE_STRING, &ldi.author, "author" }, + { TYPE_STRING, &ldi.imported_from, "imported_from" }, + { TYPE_INTEGER, &ldi.levels, "levels" }, + { TYPE_INTEGER, &ldi.first_level, "first_level" }, + { TYPE_INTEGER, &ldi.sort_priority, "sort_priority" }, + { TYPE_BOOLEAN, &ldi.level_group, "level_group" }, + { TYPE_BOOLEAN, &ldi.readonly, "readonly" } }; -static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi) +static void setTreeInfoToDefaults(TreeInfo *ldi, int type) { + ldi->type = type; + + ldi->node_top = (ldi->type == TREE_TYPE_LEVEL_DIR ? &leveldir_first : + ldi->type == TREE_TYPE_GRAPHICS_DIR ? &artwork.gfx_first : + ldi->type == TREE_TYPE_SOUNDS_DIR ? &artwork.snd_first : + ldi->type == TREE_TYPE_MUSIC_DIR ? &artwork.mus_first : + NULL); + + ldi->node_parent = NULL; + ldi->node_group = NULL; + ldi->next = NULL; + + ldi->cl_first = -1; + ldi->cl_cursor = -1; + ldi->filename = NULL; ldi->fullpath = NULL; ldi->basepath = NULL; @@ -1078,32 +1235,32 @@ static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi) ldi->name_short = NULL; ldi->name_sorting = NULL; ldi->author = getStringCopy(ANONYMOUS_NAME); - ldi->imported_from = NULL; - ldi->levels = 0; - ldi->first_level = 0; - ldi->last_level = 0; + ldi->sort_priority = LEVELCLASS_UNDEFINED; /* default: least priority */ - ldi->level_group = FALSE; ldi->parent_link = FALSE; ldi->user_defined = FALSE; - ldi->readonly = TRUE; ldi->color = 0; ldi->class_desc = NULL; - ldi->handicap_level = 0; - ldi->cl_first = -1; - ldi->cl_cursor = -1; - ldi->node_parent = NULL; - ldi->node_group = NULL; - ldi->next = NULL; + if (ldi->type == TREE_TYPE_LEVEL_DIR) + { + ldi->imported_from = NULL; + ldi->levels = 0; + ldi->first_level = 0; + ldi->last_level = 0; + ldi->level_group = FALSE; + ldi->handicap_level = 0; + ldi->readonly = TRUE; + } } -static void setLevelDirInfoToDefaultsFromParent(struct LevelDirInfo *ldi, - struct LevelDirInfo *parent) +static void setTreeInfoToDefaultsFromParent(TreeInfo *ldi, TreeInfo *parent) { if (parent == NULL) { - setLevelDirInfoToDefaults(ldi); + Error(ERR_WARN, "setTreeInfoToDefaultsFromParent(): parent == NULL"); + + setTreeInfoToDefaults(ldi, TREE_TYPE_GENERIC); return; } @@ -1129,57 +1286,14 @@ static void setLevelDirInfoToDefaultsFromParent(struct LevelDirInfo *ldi, ldi->level_group = FALSE; ldi->parent_link = FALSE; + ldi->node_top = parent->node_top; ldi->node_parent = parent; ldi->node_group = NULL; ldi->next = NULL; } -static void setSetupInfoToDefaults(struct SetupInfo *si) -{ - int i; - - 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; iinput[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); - } -} - -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; @@ -1196,6 +1310,10 @@ static void setSetupInfo(struct TokenInfo *token_info, break; case TYPE_KEY: + *(Key *)setup_value = getKeyFromKeyName(token_value); + break; + + case TYPE_KEY_X11: *(Key *)setup_value = getKeyFromX11KeyName(token_value); break; @@ -1214,44 +1332,10 @@ static void setSetupInfo(struct TokenInfo *token_info, } } -static void decodeSetupFileList(struct SetupFileList *setup_file_list) -{ - 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; - - /* handle player specific setup values */ - for (pnr=0; pnrparent_link || entry2->parent_link) @@ -1274,30 +1358,132 @@ static int compareLevelDirInfoEntries(const void *object1, const void *object2) return compare_result; } -static void createParentLevelDirNode(struct LevelDirInfo *node_parent) +static void createParentTreeInfoNode(TreeInfo *node_parent) +{ + 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; + + ti_new->name = ".. (parent directory)"; + ti_new->name_short = getStringCopy(ti_new->name); + 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->class_desc = getLevelClassDescription(ti_new); + + 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); + struct SetupFileList *setup_file_list = loadSetupFileList(filename); + LevelDirTree *leveldir_new = NULL; + int i; + + if (setup_file_list == NULL) + { + Error(ERR_WARN, "ignoring level directory '%s'", level_directory); + + 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); + + checkSetupFileListIdentifier(setup_file_list, getCookie("LEVELINFO")); + + /* set all structure fields according to the token/value pairs */ + ldi = *leveldir_new; + for (i=0; iname, 150, FC_YELLOW); + + if (leveldir_new->name_short == NULL) + leveldir_new->name_short = getStringCopy(leveldir_new->name); + + if (leveldir_new->name_sorting == NULL) + leveldir_new->name_sorting = getStringCopy(leveldir_new->name); - setLevelDirInfoToDefaults(leveldir_new); + leveldir_new->filename = getStringCopy(directory_name); - leveldir_new->node_parent = node_parent; - leveldir_new->parent_link = TRUE; + if (node_parent == NULL) /* top level group */ + { + leveldir_new->basepath = level_directory; + leveldir_new->fullpath = leveldir_new->filename; + } + else /* sub level group */ + { + leveldir_new->basepath = 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; + leveldir_new->user_defined = + (leveldir_new->basepath == options.level_directory ? FALSE : TRUE); + + leveldir_new->color = LEVELCOLOR(leveldir_new); leveldir_new->class_desc = getLevelClassDescription(leveldir_new); - pushLevelDirInfo(&node_parent->node_group, leveldir_new); + 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); + + freeSetupFileList(setup_file_list); + + 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); + } + + 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 +1498,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,110 +1518,299 @@ static void LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first, continue; } - filename = getPath2(directory_path, LEVELINFO_FILENAME); - setup_file_list = loadSetupFileList(filename); + free(directory_path); - if (setup_file_list) - { - struct LevelDirInfo *leveldir_new = newLevelDirInfo(); - int i; + valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent, + level_directory, + directory_name); + } - checkSetupFileListIdentifier(setup_file_list, LEVELINFO_COOKIE); - setLevelDirInfoToDefaultsFromParent(leveldir_new, node_parent); + closedir(dir); - /* 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; + if (!valid_entry_found) + { + /* check if this directory directly contains a file "levelinfo.conf" */ + valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent, + level_directory, "."); + } - DrawInitText(leveldir_new->name, 150, FC_YELLOW); + if (!valid_entry_found) + Error(ERR_WARN, "cannot find any valid level series in directory '%s'", + level_directory); +} - if (leveldir_new->name_short == NULL) - leveldir_new->name_short = getStringCopy(leveldir_new->name); +void LoadLevelInfo() +{ + InitUserLevelDirectory(getLoginName()); - if (leveldir_new->name_sorting == NULL) - leveldir_new->name_sorting = getStringCopy(leveldir_new->name); + DrawInitText("Loading level series:", 120, FC_GREEN); - leveldir_new->filename = getStringCopy(directory_name); + LoadLevelInfoFromLevelDir(&leveldir_first, NULL, options.level_directory); + LoadLevelInfoFromLevelDir(&leveldir_first, NULL, getUserLevelDir(NULL)); - if (node_parent == NULL) /* top level group */ - { - leveldir_new->basepath = level_directory; - leveldir_new->fullpath = leveldir_new->filename; - } - else /* sub level group */ + /* 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, + (type == TREE_TYPE_GRAPHICS_DIR ? GRAPHICSINFO_FILENAME : + type == TREE_TYPE_SOUNDS_DIR ? SOUNDSINFO_FILENAME : + type == TREE_TYPE_MUSIC_DIR ? MUSICINFO_FILENAME : "")); + struct SetupFileList *setup_file_list = NULL; + TreeInfo *artwork_new = NULL; + char *check_dir = NULL; + int i; + + if (access(filename, F_OK) == 0) /* file exists */ + loadSetupFileList(filename); + + if (setup_file_list == NULL) /* no config file -- look for artwork files */ + { + DIR *dir; + struct dirent *dir_entry; + boolean valid_file_found = FALSE; + + if ((dir = opendir(directory_path)) != NULL) + { + while ((dir_entry = readdir(dir)) != NULL) { - leveldir_new->basepath = node_parent->basepath; - leveldir_new->fullpath = getPath2(node_parent->fullpath, - directory_name); + char *entry_name = dir_entry->d_name; + + if ((type == TREE_TYPE_GRAPHICS_DIR && FileIsGraphic(entry_name)) || + (type == TREE_TYPE_SOUNDS_DIR && FileIsSound(entry_name)) || + (type == TREE_TYPE_MUSIC_DIR && FileIsMusic(entry_name))) + { + valid_file_found = TRUE; + break; + } } - 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 (options.debug) + Error(ERR_WARN, "ignoring artwork directory '%s'", base_directory); - 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_list) /* (before defining ".color" and ".class_desc") */ + { +#if 0 + checkSetupFileListIdentifier(setup_file_list, getCookie("...")); +#endif - /* step into sub-directory and look for more level series */ - LoadLevelInfoFromLevelDir(&leveldir_new->node_group, - leveldir_new, directory_path); - } + /* set all structure fields according to the token/value pairs */ + ldi = *artwork_new; + for (i=0; iname, 150, FC_YELLOW); + + if (artwork_new->name_short == NULL) + artwork_new->name_short = getStringCopy(artwork_new->name); + + if (artwork_new->name_sorting == NULL) + artwork_new->name_sorting = getStringCopy(artwork_new->name); + } + + if (node_parent == NULL) /* top level group */ + { + artwork_new->basepath = base_directory; + artwork_new->fullpath = artwork_new->filename; + } + else /* sub level group */ + { + artwork_new->basepath = node_parent->basepath; + artwork_new->fullpath = getPath2(node_parent->fullpath, directory_name); + } + + check_dir = (type == TREE_TYPE_GRAPHICS_DIR ? options.graphics_directory : + type == TREE_TYPE_SOUNDS_DIR ? options.sounds_directory : + type == TREE_TYPE_MUSIC_DIR ? options.music_directory : ""); + artwork_new->user_defined = + (artwork_new->basepath == check_dir ? FALSE : TRUE); + + /* (may use ".sort_priority" from "setup_file_list" above) */ + artwork_new->color = LEVELCOLOR(artwork_new); + artwork_new->class_desc = getLevelClassDescription(artwork_new); + + if (setup_file_list == NULL) /* (after determining ".user_defined") */ + { + if (artwork_new->name != NULL) + free(artwork_new->name); + + if (strcmp(artwork_new->filename, ".") == 0) + { + if (artwork_new->user_defined) + artwork_new->name = getStringCopy("private"); + else + artwork_new->name = getStringCopy("default"); } else - Error(ERR_WARN, "ignoring level directory '%s'", directory_path); + artwork_new->name = getStringCopy(artwork_new->filename); - free(directory_path); - free(filename); + artwork_new->name_short = getStringCopy(artwork_new->name); + artwork_new->name_sorting = getStringCopy(artwork_new->name); } - closedir(dir); + pushTreeInfo(node_first, artwork_new); - if (!valid_entry_found) - Error(ERR_WARN, "cannot find any valid level series in directory '%s'", - level_directory); + freeSetupFileList(setup_file_list); + + free(directory_path); + free(filename); + + return TRUE; } -void LoadLevelInfo() +static void LoadArtworkInfoFromArtworkDir(TreeInfo **node_first, + TreeInfo *node_parent, + char *base_directory, int type) { - InitUserLevelDirectory(getLoginName()); + DIR *dir; + struct dirent *dir_entry; + boolean valid_entry_found = FALSE; - DrawInitText("Loading level series:", 120, FC_GREEN); + if ((dir = opendir(base_directory)) == NULL) + { + if ((type == TREE_TYPE_GRAPHICS_DIR && + base_directory == options.graphics_directory) || + (type == TREE_TYPE_SOUNDS_DIR && + base_directory == options.sounds_directory) || + (type == TREE_TYPE_MUSIC_DIR && + base_directory == options.music_directory)) + Error(ERR_WARN, "cannot read directory '%s'", base_directory); + return; + } - LoadLevelInfoFromLevelDir(&leveldir_first, NULL, options.level_directory); - LoadLevelInfoFromLevelDir(&leveldir_first, NULL, getUserLevelDir("")); + 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); - leveldir_current = getFirstValidLevelSeries(leveldir_first); + /* skip entries for current and parent directory */ + if (strcmp(directory_name, ".") == 0 || + strcmp(directory_name, "..") == 0) + { + free(directory_path); + continue; + } - if (leveldir_first == NULL) - Error(ERR_EXIT, "cannot find any valid level series in any directory"); + /* 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; + } - sortLevelDirInfo(&leveldir_first, compareLevelDirInfoEntries); + free(directory_path); + + /* check if this directory contains artwork with or without config file */ + valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first,node_parent, + base_directory, + directory_name, type); + } + + closedir(dir); + + /* check if this directory directly contains artwork itself */ + valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first,node_parent, + base_directory, ".", + type); + if (!valid_entry_found) + Error(ERR_WARN, "cannot find any valid artwork in directory '%s'", + base_directory); +} + +void LoadArtworkInfo() +{ + DrawInitText("Looking for custom artwork:", 120, FC_GREEN); + + LoadArtworkInfoFromArtworkDir(&artwork.gfx_first, NULL, + options.graphics_directory, + TREE_TYPE_GRAPHICS_DIR); + LoadArtworkInfoFromArtworkDir(&artwork.gfx_first, NULL, + getUserGraphicsDir(), + TREE_TYPE_GRAPHICS_DIR); + + LoadArtworkInfoFromArtworkDir(&artwork.snd_first, NULL, + options.sounds_directory, + TREE_TYPE_SOUNDS_DIR); + LoadArtworkInfoFromArtworkDir(&artwork.snd_first, NULL, + getUserSoundsDir(), + TREE_TYPE_SOUNDS_DIR); + + LoadArtworkInfoFromArtworkDir(&artwork.mus_first, NULL, + options.music_directory, + TREE_TYPE_MUSIC_DIR); + LoadArtworkInfoFromArtworkDir(&artwork.mus_first, NULL, + getUserMusicDir(), + TREE_TYPE_MUSIC_DIR); + + /* before sorting, the first entries will be from the user directory */ + artwork.gfx_current = + getTreeInfoFromFilename(artwork.gfx_first, setup.graphics_set); + if (artwork.gfx_current == NULL) + artwork.gfx_current = getFirstValidTreeInfoEntry(artwork.gfx_first); + + artwork.snd_current = + getTreeInfoFromFilename(artwork.snd_first, setup.sounds_set); + if (artwork.snd_current == NULL) + artwork.snd_current = getFirstValidTreeInfoEntry(artwork.snd_first); + + artwork.mus_current = + getTreeInfoFromFilename(artwork.mus_first, setup.music_set); + if (artwork.mus_current == NULL) + artwork.mus_current = getFirstValidTreeInfoEntry(artwork.mus_first); + + artwork.graphics_set_current = artwork.gfx_current->name; + artwork.sounds_set_current = artwork.snd_current->name; + artwork.music_set_current = artwork.mus_current->name; + + sortTreeInfo(&artwork.gfx_first, compareTreeInfoEntries); + sortTreeInfo(&artwork.snd_first, compareTreeInfoEntries); + sortTreeInfo(&artwork.mus_first, compareTreeInfoEntries); #if 0 - dumpLevelDirInfo(leveldir_first, 0); + dumpTreeInfo(artwork.gfx_first, 0); + dumpTreeInfo(artwork.snd_first, 0); + dumpTreeInfo(artwork.mus_first, 0); #endif } @@ -1457,7 +1830,7 @@ static void SaveUserLevelInfo() } /* always start with reliable default values */ - setLevelDirInfoToDefaults(&ldi); + setTreeInfoToDefaults(&ldi, TREE_TYPE_LEVEL_DIR); ldi.name = getLoginName(); ldi.author = getRealName(); @@ -1466,10 +1839,10 @@ static void SaveUserLevelInfo() ldi.sort_priority = LEVELCLASS_USER_START; ldi.readonly = FALSE; - 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++) + 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"); - - 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); @@ -1654,11 +1952,12 @@ void LoadLevelSetup_LastSeries() char *last_level_series = getTokenValue(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES); - leveldir_current = getLevelDirInfoFromFilename(last_level_series); + leveldir_current = getTreeInfoFromFilename(leveldir_first, + last_level_series); if (leveldir_current == NULL) - leveldir_current = leveldir_first; + leveldir_current = getFirstValidTreeInfoEntry(leveldir_first); - checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE); + checkSetupFileListIdentifier(level_setup_list, getCookie("LEVELSETUP")); freeSetupFileList(level_setup_list); } @@ -1675,7 +1974,7 @@ void SaveLevelSetup_LastSeries() FILE *file; /* ----------------------------------------------------------------------- */ - /* ~/.rocksndiamonds/levelsetup.conf */ + /* ~/./levelsetup.conf */ /* ----------------------------------------------------------------------- */ InitUserDataDirectory(); @@ -1690,7 +1989,7 @@ 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)); @@ -1709,7 +2008,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); @@ -1761,7 +2060,7 @@ void LoadLevelSetup_SeriesInfo() checkSeriesInfo(leveldir_current); /* ----------------------------------------------------------------------- */ - /* ~/.rocksndiamonds/levelsetup//levelsetup.conf */ + /* ~/./levelsetup//levelsetup.conf */ /* ----------------------------------------------------------------------- */ level_subdir = leveldir_current->filename; @@ -1801,7 +2100,7 @@ void LoadLevelSetup_SeriesInfo() leveldir_current->handicap_level = level_nr; } - checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE); + checkSetupFileListIdentifier(level_setup_list, getCookie("LEVELSETUP")); freeSetupFileList(level_setup_list); } @@ -1820,7 +2119,7 @@ void SaveLevelSetup_SeriesInfo() FILE *file; /* ----------------------------------------------------------------------- */ - /* ~/.rocksndiamonds/levelsetup//levelsetup.conf */ + /* ~/./levelsetup//levelsetup.conf */ /* ----------------------------------------------------------------------- */ InitLevelSetupDirectory(level_subdir); @@ -1835,7 +2134,7 @@ 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,