/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2002 Artsoft Entertainment *
+* (c) 1994-2006 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
#include <string.h>
#include <unistd.h>
+#include "platform.h"
+
+#if !defined(PLATFORM_WIN32)
+#include <pwd.h>
+#include <sys/param.h>
+#endif
+
#include "setup.h"
#include "joystick.h"
#include "text.h"
#define LEVELCOLOR(n) (IS_LEVELCLASS_TUTORIAL(n) ? FC_BLUE : \
IS_LEVELCLASS_CLASSICS(n) ? FC_RED : \
- IS_LEVELCLASS_BD(n) ? FC_GREEN : \
+ IS_LEVELCLASS_BD(n) ? FC_YELLOW : \
IS_LEVELCLASS_EM(n) ? FC_YELLOW : \
- IS_LEVELCLASS_SP(n) ? FC_GREEN : \
+ IS_LEVELCLASS_SP(n) ? FC_YELLOW : \
IS_LEVELCLASS_DX(n) ? FC_YELLOW : \
+ IS_LEVELCLASS_SB(n) ? FC_YELLOW : \
IS_LEVELCLASS_CONTRIB(n) ? FC_GREEN : \
IS_LEVELCLASS_PRIVATE(n) ? FC_RED : \
FC_BLUE)
IS_LEVELCLASS_EM(n) ? 3 : \
IS_LEVELCLASS_SP(n) ? 4 : \
IS_LEVELCLASS_DX(n) ? 5 : \
- IS_LEVELCLASS_CONTRIB(n) ? 6 : \
- IS_LEVELCLASS_PRIVATE(n) ? 7 : \
+ IS_LEVELCLASS_SB(n) ? 6 : \
+ IS_LEVELCLASS_CONTRIB(n) ? 7 : \
+ IS_LEVELCLASS_PRIVATE(n) ? 8 : \
9)
#define ARTWORKCOLOR(n) (IS_ARTWORKCLASS_CLASSICS(n) ? FC_RED : \
- IS_ARTWORKCLASS_CONTRIB(n) ? FC_YELLOW : \
+ IS_ARTWORKCLASS_CONTRIB(n) ? FC_GREEN : \
IS_ARTWORKCLASS_PRIVATE(n) ? FC_RED : \
- IS_ARTWORKCLASS_LEVEL(n) ? FC_GREEN : \
+ IS_ARTWORKCLASS_LEVEL(n) ? FC_YELLOW : \
FC_BLUE)
#define ARTWORKSORTING(n) (IS_ARTWORKCLASS_CLASSICS(n) ? 0 : \
IS_ARTWORKCLASS_PRIVATE(n) ? 3 : \
9)
-#define TOKEN_VALUE_POSITION 40
-#define TOKEN_COMMENT_POSITION 60
+#define TOKEN_VALUE_POSITION_SHORT 32
+#define TOKEN_VALUE_POSITION_DEFAULT 40
+#define TOKEN_COMMENT_POSITION_DEFAULT 60
-#define MAX_COOKIE_LEN 256
+#define MAX_COOKIE_LEN 256
+
+static void setTreeInfoToDefaults(TreeInfo *, int);
+static int compareTreeInfoEntries(const void *, const void *);
+
+static int token_value_position = TOKEN_VALUE_POSITION_DEFAULT;
+static int token_comment_position = TOKEN_COMMENT_POSITION_DEFAULT;
/* ------------------------------------------------------------------------- */
/* file functions */
/* ------------------------------------------------------------------------- */
-static char *getLevelClassDescription(TreeInfo *ldi)
+static char *getLevelClassDescription(TreeInfo *ti)
{
- int position = ldi->sort_priority / 100;
+ int position = ti->sort_priority / 100;
if (position >= 0 && position < NUM_LEVELCLASS_DESC)
return levelclass_desc[position];
static char *getUserLevelDir(char *level_subdir)
{
static char *userlevel_dir = NULL;
- char *data_dir = getUserDataDir();
+ char *data_dir = getUserGameDataDir();
char *userlevel_subdir = LEVELS_DIRECTORY;
- if (userlevel_dir)
- free(userlevel_dir);
+ checked_free(userlevel_dir);
if (level_subdir != NULL)
userlevel_dir = getPath3(data_dir, userlevel_subdir, level_subdir);
return userlevel_dir;
}
-static char *getTapeDir(char *level_subdir)
-{
- static char *tape_dir = NULL;
- char *data_dir = getUserDataDir();
- char *tape_subdir = TAPES_DIRECTORY;
-
- if (tape_dir)
- free(tape_dir);
-
- if (level_subdir != NULL)
- tape_dir = getPath3(data_dir, tape_subdir, level_subdir);
- else
- tape_dir = getPath2(data_dir, tape_subdir);
-
- return tape_dir;
-}
-
static char *getScoreDir(char *level_subdir)
{
static char *score_dir = NULL;
char *data_dir = getCommonDataDir();
char *score_subdir = SCORES_DIRECTORY;
- if (score_dir)
- free(score_dir);
+ checked_free(score_dir);
if (level_subdir != NULL)
score_dir = getPath3(data_dir, score_subdir, level_subdir);
static char *getLevelSetupDir(char *level_subdir)
{
static char *levelsetup_dir = NULL;
- char *data_dir = getUserDataDir();
+ char *data_dir = getUserGameDataDir();
char *levelsetup_subdir = LEVELSETUP_DIRECTORY;
- if (levelsetup_dir)
- free(levelsetup_dir);
+ checked_free(levelsetup_dir);
if (level_subdir != NULL)
levelsetup_dir = getPath3(data_dir, levelsetup_subdir, level_subdir);
if (node == NULL)
return options.level_directory;
- if (level_dir)
- free(level_dir);
+ checked_free(level_dir);
- level_dir = getPath2((node->user_defined ? getUserLevelDir(NULL) :
+ level_dir = getPath2((node->in_user_dir ? getUserLevelDir(NULL) :
options.level_directory), node->fullpath);
return level_dir;
}
-static char *getCurrentLevelDir()
+char *getCurrentLevelDir()
{
return getLevelDirFromTreeInfo(leveldir_current);
}
+static char *getTapeDir(char *level_subdir)
+{
+ static char *tape_dir = NULL;
+ char *data_dir = getUserGameDataDir();
+ char *tape_subdir = TAPES_DIRECTORY;
+
+ checked_free(tape_dir);
+
+ if (level_subdir != NULL)
+ tape_dir = getPath3(data_dir, tape_subdir, level_subdir);
+ else
+ tape_dir = getPath2(data_dir, tape_subdir);
+
+ return tape_dir;
+}
+
+static char *getSolutionTapeDir()
+{
+ static char *tape_dir = NULL;
+ char *data_dir = getCurrentLevelDir();
+ char *tape_subdir = TAPES_DIRECTORY;
+
+ checked_free(tape_dir);
+
+ tape_dir = getPath2(data_dir, tape_subdir);
+
+ return tape_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);
+ checked_free(graphics_dir);
graphics_dir = getPath2(options.graphics_directory, graphics_subdir);
if (sounds_subdir == NULL)
return options.sounds_directory;
- if (sounds_dir)
- free(sounds_dir);
+ checked_free(sounds_dir);
sounds_dir = getPath2(options.sounds_directory, sounds_subdir);
if (music_subdir == NULL)
return options.music_directory;
- if (music_dir)
- free(music_dir);
+ checked_free(music_dir);
music_dir = getPath2(options.music_directory, music_subdir);
static char *usergraphics_dir = NULL;
if (usergraphics_dir == NULL)
- usergraphics_dir = getPath2(getUserDataDir(), GRAPHICS_DIRECTORY);
+ usergraphics_dir = getPath2(getUserGameDataDir(), GRAPHICS_DIRECTORY);
return usergraphics_dir;
}
static char *usersounds_dir = NULL;
if (usersounds_dir == NULL)
- usersounds_dir = getPath2(getUserDataDir(), SOUNDS_DIRECTORY);
+ usersounds_dir = getPath2(getUserGameDataDir(), SOUNDS_DIRECTORY);
return usersounds_dir;
}
static char *usermusic_dir = NULL;
if (usermusic_dir == NULL)
- usermusic_dir = getPath2(getUserDataDir(), MUSIC_DIRECTORY);
+ usermusic_dir = getPath2(getUserGameDataDir(), MUSIC_DIRECTORY);
return usermusic_dir;
}
{
static char *artwork_dir = NULL;
- if (artwork_dir != NULL)
- free(artwork_dir);
+ checked_free(artwork_dir);
artwork_dir = getPath2(ti->basepath, ti->fullpath);
if (ti == NULL || leveldir_current == NULL)
return NULL;
- artwork_path_ptr = &(LEVELDIR_ARTWORK_PATH(leveldir_current, ti->type));
- artwork_set_ptr = &(LEVELDIR_ARTWORK_SET( leveldir_current, ti->type));
+ artwork_path_ptr = LEVELDIR_ARTWORK_PATH_PTR(leveldir_current, ti->type);
+ artwork_set_ptr = LEVELDIR_ARTWORK_SET_PTR( leveldir_current, ti->type);
- if (*artwork_path_ptr != NULL)
- free(*artwork_path_ptr);
+ checked_free(*artwork_path_ptr);
if ((level_artwork = getTreeInfoFromIdentifier(ti, *artwork_set_ptr)))
*artwork_path_ptr = getStringCopy(getSetupArtworkDir(level_artwork));
char *dir = getPath2(getCurrentLevelDir(), ARTWORK_DIRECTORY(ti->type));
- if (*artwork_set_ptr != NULL)
- free(*artwork_set_ptr);
+ checked_free(*artwork_set_ptr);
if (fileExists(dir))
{
return LEVELDIR_ARTWORK_PATH(leveldir_current, type);
}
-char *getLevelFilename(int nr)
+char *getTapeFilename(int nr)
{
static char *filename = NULL;
char basename[MAX_FILENAME_LEN];
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
- if (nr < 0)
- sprintf(basename, "template.%s", LEVELFILE_EXTENSION);
- else
- sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION);
-
- filename = getPath2(getCurrentLevelDir(), basename);
+ sprintf(basename, "%03d.%s", nr, TAPEFILE_EXTENSION);
+ filename = getPath2(getTapeDir(leveldir_current->subdir), basename);
return filename;
}
-char *getTapeFilename(int nr)
+char *getSolutionTapeFilename(int nr)
{
static char *filename = NULL;
char basename[MAX_FILENAME_LEN];
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
sprintf(basename, "%03d.%s", nr, TAPEFILE_EXTENSION);
- filename = getPath2(getTapeDir(leveldir_current->filename), basename);
+ filename = getPath2(getSolutionTapeDir(), basename);
return filename;
}
static char *filename = NULL;
char basename[MAX_FILENAME_LEN];
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
sprintf(basename, "%03d.%s", nr, SCOREFILE_EXTENSION);
- filename = getPath2(getScoreDir(leveldir_current->filename), basename);
+ filename = getPath2(getScoreDir(leveldir_current->subdir), basename);
return filename;
}
{
static char *filename = NULL;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
filename = getPath2(getSetupDir(), SETUP_FILENAME);
{
static char *filename = NULL;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
+ filename = getPath2(getCurrentLevelDir(), EDITORSETUP_FILENAME);
+
+ if (fileExists(filename))
+ return filename;
+ checked_free(filename);
filename = getPath2(getSetupDir(), EDITORSETUP_FILENAME);
return filename;
}
+char *getHelpAnimFilename()
+{
+ static char *filename = NULL;
+
+ checked_free(filename);
+
+ filename = getPath2(getCurrentLevelDir(), HELPANIM_FILENAME);
+
+ return filename;
+}
+
+char *getHelpTextFilename()
+{
+ static char *filename = NULL;
+
+ checked_free(filename);
+
+ filename = getPath2(getCurrentLevelDir(), HELPTEXT_FILENAME);
+
+ return filename;
+}
+
+char *getLevelSetInfoFilename()
+{
+ static char *filename = NULL;
+ char *basenames[] =
+ {
+ "README",
+ "README.TXT",
+ "README.txt",
+ "Readme",
+ "Readme.txt",
+ "readme",
+ "readme.txt",
+
+ NULL
+ };
+ int i;
+
+ for (i = 0; basenames[i] != NULL; i++)
+ {
+ checked_free(filename);
+ filename = getPath2(getCurrentLevelDir(), basenames[i]);
+
+ if (fileExists(filename))
+ return filename;
+ }
+
+ return NULL;
+}
+
static char *getCorrectedArtworkBasename(char *basename)
{
char *basename_corrected = basename;
{
static char *msdos_filename = NULL;
- if (msdos_filename != NULL)
- free(msdos_filename);
+ checked_free(msdos_filename);
msdos_filename = getStringCopy(basename_corrected);
strncpy(&msdos_filename[8], &basename[strlen(basename) - (1+3)], 1+3 +1);
static char *filename = NULL;
boolean skip_setup_artwork = FALSE;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
basename = getCorrectedArtworkBasename(basename);
static char *filename = NULL;
boolean skip_setup_artwork = FALSE;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
basename = getCorrectedArtworkBasename(basename);
static char *filename = NULL;
boolean skip_setup_artwork = FALSE;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
basename = getCorrectedArtworkBasename(basename);
{
static char *filename = NULL;
- if (filename != NULL)
- free(filename);
+ checked_free(filename);
filename = getPath2(getLevelArtworkDir(type), ARTWORKINFO_FILENAME(type));
static char *directory = NULL;
boolean skip_setup_artwork = FALSE;
- if (directory != NULL)
- free(directory);
+ checked_free(directory);
if (!setup.override_level_music)
{
void InitTapeDirectory(char *level_subdir)
{
- createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE);
+ createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
createDirectory(getTapeDir(NULL), "main tape", PERMS_PRIVATE);
createDirectory(getTapeDir(level_subdir), "level tape", PERMS_PRIVATE);
}
void InitUserLevelDirectory(char *level_subdir)
{
- if (access(getUserLevelDir(level_subdir), F_OK) != 0)
+ if (!fileExists(getUserLevelDir(level_subdir)))
{
- createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE);
+ createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
createDirectory(getUserLevelDir(NULL), "main user level", PERMS_PRIVATE);
createDirectory(getUserLevelDir(level_subdir), "user level",PERMS_PRIVATE);
void InitLevelSetupDirectory(char *level_subdir)
{
- createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE);
+ createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
createDirectory(getLevelSetupDir(NULL), "main level setup", PERMS_PRIVATE);
createDirectory(getLevelSetupDir(level_subdir), "level setup",PERMS_PRIVATE);
}
/* ------------------------------------------------------------------------- */
-/* some functions to handle lists of level directories */
+/* some functions to handle lists of level and artwork directories */
/* ------------------------------------------------------------------------- */
TreeInfo *newTreeInfo()
return checked_calloc(sizeof(TreeInfo));
}
+TreeInfo *newTreeInfo_setDefaults(int type)
+{
+ TreeInfo *ti = newTreeInfo();
+
+ setTreeInfoToDefaults(ti, type);
+
+ return ti;
+}
+
void pushTreeInfo(TreeInfo **node_first, TreeInfo *node_new)
{
node_new->next = *node_first;
}
else if (!node->parent_link)
{
- if (strcmp(identifier, node->identifier) == 0)
+ if (strEqual(identifier, node->identifier))
return node;
}
return NULL;
}
+TreeInfo *cloneTreeNode(TreeInfo **node_top, TreeInfo *node_parent,
+ TreeInfo *node, boolean skip_sets_without_levels)
+{
+ TreeInfo *node_new;
+
+ if (node == NULL)
+ return NULL;
+
+ if (!node->parent_link && !node->level_group &&
+ skip_sets_without_levels && node->levels == 0)
+ return cloneTreeNode(node_top, node_parent, node->next,
+ skip_sets_without_levels);
+
+ node_new = newTreeInfo();
+
+ *node_new = *node; /* copy complete node */
+
+ node_new->node_top = node_top; /* correct top node link */
+ node_new->node_parent = node_parent; /* correct parent node link */
+
+ if (node->level_group)
+ node_new->node_group = cloneTreeNode(node_top, node_new, node->node_group,
+ skip_sets_without_levels);
+
+ node_new->next = cloneTreeNode(node_top, node_parent, node->next,
+ skip_sets_without_levels);
+
+ return node_new;
+}
+
+void cloneTree(TreeInfo **ti_new, TreeInfo *ti, boolean skip_empty_sets)
+{
+ TreeInfo *ti_cloned = cloneTreeNode(ti_new, NULL, ti, skip_empty_sets);
+
+ *ti_new = ti_cloned;
+}
+
+static boolean adjustTreeGraphicsForEMC(TreeInfo *node)
+{
+ boolean settings_changed = FALSE;
+
+ while (node)
+ {
+ if (node->graphics_set_ecs && !setup.prefer_aga_graphics &&
+ !strEqual(node->graphics_set, node->graphics_set_ecs))
+ {
+ setString(&node->graphics_set, node->graphics_set_ecs);
+ settings_changed = TRUE;
+ }
+ else if (node->graphics_set_aga && setup.prefer_aga_graphics &&
+ !strEqual(node->graphics_set, node->graphics_set_aga))
+ {
+ setString(&node->graphics_set, node->graphics_set_aga);
+ settings_changed = TRUE;
+ }
+
+ if (node->node_group != NULL)
+ settings_changed |= adjustTreeGraphicsForEMC(node->node_group);
+
+ node = node->next;
+ }
+
+ return settings_changed;
+}
+
void dumpTreeInfo(TreeInfo *node, int depth)
{
int i;
while (node)
{
- for (i=0; i<(depth + 1) * 3; i++)
+ for (i = 0; i < (depth + 1) * 3; i++)
printf(" ");
-#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
+ printf("subdir == '%s' ['%s', '%s'] [%d])\n",
+ node->subdir, node->fullpath, node->basepath, node->in_user_dir);
if (node->node_group != NULL)
dumpTreeInfo(node->node_group, depth + 1);
}
}
-void sortTreeInfo(TreeInfo **node_first,
- int (*compare_function)(const void *, const void *))
+void sortTreeInfoBySortFunction(TreeInfo **node_first,
+ int (*compare_function)(const void *,
+ const void *))
{
int num_nodes = numTreeInfo(*node_first);
TreeInfo **sort_array;
compare_function);
/* update the linkage of list elements with the sorted node array */
- for (i=0; i<num_nodes - 1; i++)
+ for (i = 0; i < num_nodes - 1; i++)
sort_array[i]->next = sort_array[i + 1];
sort_array[num_nodes - 1]->next = NULL;
while (node)
{
if (node->node_group != NULL)
- sortTreeInfo(&node->node_group, compare_function);
+ sortTreeInfoBySortFunction(&node->node_group, compare_function);
node = node->next;
}
}
+void sortTreeInfo(TreeInfo **node_first)
+{
+ sortTreeInfoBySortFunction(node_first, compareTreeInfoEntries);
+}
+
/* ========================================================================= */
/* some stuff from "files.c" */
#define FILE_PERMS_PRIVATE (MODE_R_ALL | MODE_W_PRIVATE)
#define FILE_PERMS_PUBLIC (MODE_R_ALL | MODE_W_PUBLIC)
-char *getUserDataDir(void)
+char *getHomeDir()
{
- static char *userdata_dir = NULL;
+ static char *dir = NULL;
+
+#if defined(PLATFORM_WIN32)
+ if (dir == NULL)
+ {
+ dir = checked_malloc(MAX_PATH + 1);
+
+ if (!SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, dir)))
+ strcpy(dir, ".");
+ }
+#elif defined(PLATFORM_UNIX)
+ if (dir == NULL)
+ {
+ if ((dir = getenv("HOME")) == NULL)
+ {
+ struct passwd *pwd;
- if (userdata_dir == NULL)
- userdata_dir = getPath2(getHomeDir(), program.userdata_directory);
+ if ((pwd = getpwuid(getuid())) != NULL)
+ dir = getStringCopy(pwd->pw_dir);
+ else
+ dir = ".";
+ }
+ }
+#else
+ dir = ".";
+#endif
- return userdata_dir;
+ return dir;
}
char *getCommonDataDir(void)
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);
+ && !strEqual(dir, "")) /* empty for Windows 95/98 */
+ common_data_dir = getPath2(dir, program.userdata_subdir);
else
common_data_dir = options.rw_base_directory;
}
return common_data_dir;
}
+char *getPersonalDataDir(void)
+{
+ static char *personal_data_dir = NULL;
+
+#if defined(PLATFORM_MACOSX)
+ if (personal_data_dir == NULL)
+ personal_data_dir = getPath2(getHomeDir(), "Documents");
+#else
+ if (personal_data_dir == NULL)
+ personal_data_dir = getHomeDir();
+#endif
+
+ return personal_data_dir;
+}
+
+char *getUserGameDataDir(void)
+{
+ if (program.userdata_path == NULL)
+ program.userdata_path = getPath2(getPersonalDataDir(),
+ program.userdata_subdir);
+
+ return program.userdata_path;
+}
+
+void updateUserGameDataDir()
+{
+#if defined(PLATFORM_MACOSX)
+ char *userdata_dir_old = getPath2(getHomeDir(), program.userdata_subdir_unix);
+ char *userdata_dir_new = getUserGameDataDir();
+
+ /* convert old Unix style game data directory to Mac OS X style, if needed */
+ if (fileExists(userdata_dir_old) && !fileExists(userdata_dir_new))
+ {
+ if (rename(userdata_dir_old, userdata_dir_new) != 0)
+ {
+ Error(ERR_WARN, "cannot move game data directory '%s' to '%s'",
+ userdata_dir_old, userdata_dir_new);
+
+ /* continue using Unix style data directory -- this should not happen */
+ program.userdata_path = getPath2(getPersonalDataDir(),
+ program.userdata_subdir_unix);
+ }
+ }
+
+ free(userdata_dir_old);
+ free(userdata_dir_new);
+#endif
+}
+
char *getSetupDir()
{
- return getUserDataDir();
+ return getUserGameDataDir();
}
static mode_t posix_umask(mode_t mask)
mode_t group_umask = ~(dir_mode & S_IRWXG);
posix_umask(normal_umask & group_umask);
- if (access(dir, F_OK) != 0)
+ if (!fileExists(dir))
if (posix_mkdir(dir, dir_mode) != 0)
Error(ERR_WARN, "cannot create %s directory '%s'", text, dir);
void InitUserDataDirectory()
{
- createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE);
+ createDirectory(getUserGameDataDir(), "user data", PERMS_PRIVATE);
}
void SetFilePermissions(char *filename, int permission_class)
int i;
static char entry[MAX_LINE_LEN];
+ /* if value is an empty string, just return token without value */
+ if (*value == '\0')
+ return token;
+
/* start with the token and some spaces to format output line */
sprintf(entry, "%s:", token);
- for (i=strlen(entry); i<TOKEN_VALUE_POSITION; i++)
+ for (i = strlen(entry); i < token_value_position; i++)
strcat(entry, " ");
/* continue with the token's value */
if (list == NULL)
return;
- if (list->token)
- free(list->token);
- if (list->value)
- free(list->value);
+ checked_free(list->token);
+ checked_free(list->value);
+
if (list->next)
freeSetupFileList(list->next);
+
free(list);
}
if (list == NULL)
return NULL;
- if (strcmp(list->token, token) == 0)
+ if (strEqual(list->token, token))
return list->value;
else
return getListEntry(list->next, token);
if (list == NULL)
return NULL;
- if (strcmp(list->token, token) == 0)
+ if (strEqual(list->token, token))
{
- if (list->value)
- free(list->value);
+ checked_free(list->value);
list->value = getStringCopy(value);
return setListEntry(list->next, token, value);
}
+SetupFileList *addListEntry(SetupFileList *list, char *token, char *value)
+{
+ if (list == NULL)
+ return NULL;
+
+ if (list->next == NULL)
+ return (list->next = newSetupFileList(token, value));
+ else
+ return addListEntry(list->next, token, value);
+}
+
#ifdef DEBUG
static void printSetupFileList(SetupFileList *list)
{
static int keys_are_equal(void *key1, void *key2)
{
- return (strcmp((char *)key1, (char *)key2) == 0);
+ return (strEqual((char *)key1, (char *)key2));
}
SetupFileHash *newSetupFileHash()
Error(ERR_EXIT, "cannot insert into hash -- aborting");
}
+char *removeHashEntry(SetupFileHash *hash, char *token)
+{
+ if (hash == NULL)
+ return NULL;
+
+ return remove_hash_entry(hash, token);
+}
+
#if 0
-#ifdef DEBUG
static void printSetupFileHash(SetupFileHash *hash)
{
BEGIN_HASH_ITERATION(hash, itr)
END_HASH_ITERATION(hash, itr)
}
#endif
-#endif
static void *loadSetupFileData(char *filename, boolean use_hash)
{
- int line_len;
- char line[MAX_LINE_LEN];
+ char line[MAX_LINE_LEN], previous_line[MAX_LINE_LEN];
char *token, *value, *line_ptr;
void *setup_file_data, *insert_ptr = NULL;
+ boolean read_continued_line = FALSE;
FILE *file;
- if (use_hash)
- setup_file_data = newSetupFileHash();
- else
- insert_ptr = setup_file_data = newSetupFileList("", "");
-
if (!(file = fopen(filename, MODE_READ)))
{
Error(ERR_WARN, "cannot open configuration file '%s'", filename);
+
return NULL;
}
- while(!feof(file))
+ if (use_hash)
+ setup_file_data = newSetupFileHash();
+ else
+ insert_ptr = setup_file_data = newSetupFileList("", "");
+
+ while (!feof(file))
{
/* read next line of input file */
if (!fgets(line, MAX_LINE_LEN, file))
break;
- /* cut trailing comment or whitespace from input line */
+ /* cut trailing newline or carriage return */
+ for (line_ptr = &line[strlen(line)]; line_ptr >= line; line_ptr--)
+ if ((*line_ptr == '\n' || *line_ptr == '\r') && *(line_ptr + 1) == '\0')
+ *line_ptr = '\0';
+
+ if (read_continued_line)
+ {
+ /* cut leading whitespaces from input line */
+ for (line_ptr = line; *line_ptr; line_ptr++)
+ if (*line_ptr != ' ' && *line_ptr != '\t')
+ break;
+
+ /* append new line to existing line, if there is enough space */
+ if (strlen(previous_line) + strlen(line_ptr) < MAX_LINE_LEN)
+ strcat(previous_line, line_ptr);
+
+ strcpy(line, previous_line); /* copy storage buffer to line */
+
+ read_continued_line = FALSE;
+ }
+
+ /* if the last character is '\', continue at next line */
+ if (strlen(line) > 0 && line[strlen(line) - 1] == '\\')
+ {
+ line[strlen(line) - 1] = '\0'; /* cut off trailing backslash */
+ strcpy(previous_line, line); /* copy line to storage buffer */
+
+ read_continued_line = TRUE;
+
+ continue;
+ }
+
+ /* cut trailing comment from input line */
for (line_ptr = line; *line_ptr; line_ptr++)
{
- if (*line_ptr == '#' || *line_ptr == '\n' || *line_ptr == '\r')
+ if (*line_ptr == '#')
{
*line_ptr = '\0';
break;
}
/* cut trailing whitespaces from input line */
- for (line_ptr = &line[strlen(line)]; line_ptr > line; line_ptr--)
- if ((*line_ptr == ' ' || *line_ptr == '\t') && line_ptr[1] == '\0')
+ for (line_ptr = &line[strlen(line)]; line_ptr >= line; line_ptr--)
+ if ((*line_ptr == ' ' || *line_ptr == '\t') && *(line_ptr + 1) == '\0')
*line_ptr = '\0';
/* ignore empty lines */
if (*line == '\0')
continue;
- line_len = strlen(line);
-
/* cut leading whitespaces from token */
for (token = line; *token; token++)
if (*token != ' ' && *token != '\t')
break;
- /* find end of token */
+ /* start with empty value as reliable default */
+ value = "";
+
+ /* find end of token to determine start of value */
for (line_ptr = token; *line_ptr; line_ptr++)
{
if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':')
{
- *line_ptr = '\0';
+ *line_ptr = '\0'; /* terminate token string */
+ value = line_ptr + 1; /* set beginning of value */
+
break;
}
}
- if (line_ptr < line + line_len)
- value = line_ptr + 1;
- else
-#if 1
- value = "true"; /* treat tokens without value as "true" */
-#else
- value = "\0";
-#endif
-
/* cut leading whitespaces from value */
for (; *value; value++)
if (*value != ' ' && *value != '\t')
break;
- if (*token && *value)
+#if 0
+ if (*value == '\0')
+ value = "true"; /* treat tokens without value as "true" */
+#endif
+
+ if (*token)
{
if (use_hash)
setHashEntry((SetupFileHash *)setup_file_data, token, value);
else
- insert_ptr = setListEntry((SetupFileList *)insert_ptr, token, value);
+ insert_ptr = addListEntry((SetupFileList *)insert_ptr, token, value);
}
}
}
void checkSetupFileHashIdentifier(SetupFileHash *setup_file_hash,
- char *identifier)
+ char *filename, char *identifier)
{
char *value = getHashEntry(setup_file_hash, TOKEN_STR_FILE_IDENTIFIER);
if (value == NULL)
- Error(ERR_WARN, "configuration file has no file identifier");
+ Error(ERR_WARN, "config file '%s' has no file identifier", filename);
else if (!checkCookieString(value, identifier))
- Error(ERR_WARN, "configuration file has wrong file identifier");
+ Error(ERR_WARN, "config file '%s' has wrong file identifier", filename);
}
/* setup file stuff */
/* ========================================================================= */
-#define TOKEN_STR_LAST_LEVEL_SERIES "last_level_series"
-#define TOKEN_STR_LAST_PLAYED_LEVEL "last_played_level"
-#define TOKEN_STR_HANDICAP_LEVEL "handicap_level"
+#define TOKEN_STR_LAST_LEVEL_SERIES "last_level_series"
+#define TOKEN_STR_LAST_PLAYED_LEVEL "last_played_level"
+#define TOKEN_STR_HANDICAP_LEVEL "handicap_level"
/* level directory info */
-#define LEVELINFO_TOKEN_IDENTIFIER 0
-#define LEVELINFO_TOKEN_NAME 1
-#define LEVELINFO_TOKEN_NAME_SORTING 2
-#define LEVELINFO_TOKEN_AUTHOR 3
-#define LEVELINFO_TOKEN_IMPORTED_FROM 4
-#define LEVELINFO_TOKEN_LEVELS 5
-#define LEVELINFO_TOKEN_FIRST_LEVEL 6
-#define LEVELINFO_TOKEN_SORT_PRIORITY 7
-#define LEVELINFO_TOKEN_LATEST_ENGINE 8
-#define LEVELINFO_TOKEN_LEVEL_GROUP 9
-#define LEVELINFO_TOKEN_READONLY 10
-#define LEVELINFO_TOKEN_GRAPHICS_SET 11
-#define LEVELINFO_TOKEN_SOUNDS_SET 12
-#define LEVELINFO_TOKEN_MUSIC_SET 13
-
-#define NUM_LEVELINFO_TOKENS 14
+#define LEVELINFO_TOKEN_IDENTIFIER 0
+#define LEVELINFO_TOKEN_NAME 1
+#define LEVELINFO_TOKEN_NAME_SORTING 2
+#define LEVELINFO_TOKEN_AUTHOR 3
+#define LEVELINFO_TOKEN_IMPORTED_FROM 4
+#define LEVELINFO_TOKEN_IMPORTED_BY 5
+#define LEVELINFO_TOKEN_LEVELS 6
+#define LEVELINFO_TOKEN_FIRST_LEVEL 7
+#define LEVELINFO_TOKEN_SORT_PRIORITY 8
+#define LEVELINFO_TOKEN_LATEST_ENGINE 9
+#define LEVELINFO_TOKEN_LEVEL_GROUP 10
+#define LEVELINFO_TOKEN_READONLY 11
+#define LEVELINFO_TOKEN_GRAPHICS_SET_ECS 12
+#define LEVELINFO_TOKEN_GRAPHICS_SET_AGA 13
+#define LEVELINFO_TOKEN_GRAPHICS_SET 14
+#define LEVELINFO_TOKEN_SOUNDS_SET 15
+#define LEVELINFO_TOKEN_MUSIC_SET 16
+#define LEVELINFO_TOKEN_FILENAME 17
+#define LEVELINFO_TOKEN_FILETYPE 18
+#define LEVELINFO_TOKEN_HANDICAP 19
+#define LEVELINFO_TOKEN_SKIP_LEVELS 20
+
+#define NUM_LEVELINFO_TOKENS 21
static LevelDirTree ldi;
static struct TokenInfo levelinfo_tokens[] =
{
/* level directory info */
- { TYPE_STRING, &ldi.identifier, "identifier" },
- { TYPE_STRING, &ldi.name, "name" },
- { TYPE_STRING, &ldi.name_sorting, "name_sorting" },
- { TYPE_STRING, &ldi.author, "author" },
- { TYPE_STRING, &ldi.imported_from, "imported_from" },
- { TYPE_INTEGER, &ldi.levels, "levels" },
- { TYPE_INTEGER, &ldi.first_level, "first_level" },
- { TYPE_INTEGER, &ldi.sort_priority, "sort_priority" },
- { TYPE_BOOLEAN, &ldi.latest_engine, "latest_engine" },
- { TYPE_BOOLEAN, &ldi.level_group, "level_group" },
- { TYPE_BOOLEAN, &ldi.readonly, "readonly" },
- { TYPE_STRING, &ldi.graphics_set, "graphics_set" },
- { TYPE_STRING, &ldi.sounds_set, "sounds_set" },
- { TYPE_STRING, &ldi.music_set, "music_set" }
+ { TYPE_STRING, &ldi.identifier, "identifier" },
+ { TYPE_STRING, &ldi.name, "name" },
+ { TYPE_STRING, &ldi.name_sorting, "name_sorting" },
+ { TYPE_STRING, &ldi.author, "author" },
+ { TYPE_STRING, &ldi.imported_from, "imported_from" },
+ { TYPE_STRING, &ldi.imported_by, "imported_by" },
+ { TYPE_INTEGER, &ldi.levels, "levels" },
+ { TYPE_INTEGER, &ldi.first_level, "first_level" },
+ { TYPE_INTEGER, &ldi.sort_priority, "sort_priority" },
+ { TYPE_BOOLEAN, &ldi.latest_engine, "latest_engine" },
+ { TYPE_BOOLEAN, &ldi.level_group, "level_group" },
+ { TYPE_BOOLEAN, &ldi.readonly, "readonly" },
+ { TYPE_STRING, &ldi.graphics_set_ecs, "graphics_set.ecs" },
+ { TYPE_STRING, &ldi.graphics_set_aga, "graphics_set.aga" },
+ { TYPE_STRING, &ldi.graphics_set, "graphics_set" },
+ { TYPE_STRING, &ldi.sounds_set, "sounds_set" },
+ { TYPE_STRING, &ldi.music_set, "music_set" },
+ { TYPE_STRING, &ldi.level_filename, "filename" },
+ { TYPE_STRING, &ldi.level_filetype, "filetype" },
+ { TYPE_BOOLEAN, &ldi.handicap, "handicap" },
+ { TYPE_BOOLEAN, &ldi.skip_levels, "skip_levels" }
};
-static void setTreeInfoToDefaults(TreeInfo *ldi, int type)
+static void setTreeInfoToDefaults(TreeInfo *ti, int type)
{
- ldi->type = type;
+ ti->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);
+ ti->node_top = (ti->type == TREE_TYPE_LEVEL_DIR ? &leveldir_first :
+ ti->type == TREE_TYPE_GRAPHICS_DIR ? &artwork.gfx_first :
+ ti->type == TREE_TYPE_SOUNDS_DIR ? &artwork.snd_first :
+ ti->type == TREE_TYPE_MUSIC_DIR ? &artwork.mus_first :
+ NULL);
- ldi->node_parent = NULL;
- ldi->node_group = NULL;
- ldi->next = NULL;
+ ti->node_parent = NULL;
+ ti->node_group = NULL;
+ ti->next = NULL;
- ldi->cl_first = -1;
- ldi->cl_cursor = -1;
+ ti->cl_first = -1;
+ ti->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(ANONYMOUS_NAME);
+ ti->subdir = NULL;
+ ti->fullpath = NULL;
+ ti->basepath = NULL;
+ ti->identifier = NULL;
+ ti->name = getStringCopy(ANONYMOUS_NAME);
+ ti->name_sorting = NULL;
+ ti->author = getStringCopy(ANONYMOUS_NAME);
- ldi->sort_priority = LEVELCLASS_UNDEFINED; /* default: least priority */
- ldi->latest_engine = FALSE; /* default: get from level */
- ldi->parent_link = FALSE;
- ldi->user_defined = FALSE;
- ldi->color = 0;
- ldi->class_desc = NULL;
+ ti->sort_priority = LEVELCLASS_UNDEFINED; /* default: least priority */
+ ti->latest_engine = FALSE; /* default: get from level */
+ ti->parent_link = FALSE;
+ ti->in_user_dir = FALSE;
+ ti->user_defined = FALSE;
+ ti->color = 0;
+ ti->class_desc = 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);
+ ti->infotext = getStringCopy(TREE_INFOTEXT(ti->type));
- ldi->levels = 0;
- ldi->first_level = 0;
- ldi->last_level = 0;
- ldi->level_group = FALSE;
- ldi->handicap_level = 0;
- ldi->readonly = TRUE;
+ if (ti->type == TREE_TYPE_LEVEL_DIR)
+ {
+ ti->imported_from = NULL;
+ ti->imported_by = NULL;
+
+ ti->graphics_set_ecs = NULL;
+ ti->graphics_set_aga = NULL;
+ ti->graphics_set = NULL;
+ ti->sounds_set = NULL;
+ ti->music_set = NULL;
+ ti->graphics_path = getStringCopy(UNDEFINED_FILENAME);
+ ti->sounds_path = getStringCopy(UNDEFINED_FILENAME);
+ ti->music_path = getStringCopy(UNDEFINED_FILENAME);
+
+ ti->level_filename = NULL;
+ ti->level_filetype = NULL;
+
+ ti->levels = 0;
+ ti->first_level = 0;
+ ti->last_level = 0;
+ ti->level_group = FALSE;
+ ti->handicap_level = 0;
+ ti->readonly = TRUE;
+ ti->handicap = TRUE;
+ ti->skip_levels = FALSE;
}
}
-static void setTreeInfoToDefaultsFromParent(TreeInfo *ldi, TreeInfo *parent)
+static void setTreeInfoToDefaultsFromParent(TreeInfo *ti, TreeInfo *parent)
{
if (parent == NULL)
{
Error(ERR_WARN, "setTreeInfoToDefaultsFromParent(): parent == NULL");
- setTreeInfoToDefaults(ldi, TREE_TYPE_UNDEFINED);
+ setTreeInfoToDefaults(ti, 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;
+ ti->type = parent->type;
- ldi->cl_first = -1;
- ldi->cl_cursor = -1;
+ ti->node_top = parent->node_top;
+ ti->node_parent = parent;
+ ti->node_group = NULL;
+ ti->next = NULL;
- 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);
+ ti->cl_first = -1;
+ ti->cl_cursor = -1;
- 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);
+ ti->subdir = NULL;
+ ti->fullpath = NULL;
+ ti->basepath = NULL;
+ ti->identifier = NULL;
+ ti->name = getStringCopy(ANONYMOUS_NAME);
+ ti->name_sorting = NULL;
+ ti->author = getStringCopy(parent->author);
- if (ldi->type == TREE_TYPE_LEVEL_DIR)
- {
- ldi->imported_from = getStringCopy(parent->imported_from);
+ ti->sort_priority = parent->sort_priority;
+ ti->latest_engine = parent->latest_engine;
+ ti->parent_link = FALSE;
+ ti->in_user_dir = parent->in_user_dir;
+ ti->user_defined = parent->user_defined;
+ ti->color = parent->color;
+ ti->class_desc = getStringCopy(parent->class_desc);
- 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);
+ ti->infotext = getStringCopy(parent->infotext);
- ldi->levels = 0;
- ldi->first_level = 0;
- ldi->last_level = 0;
- ldi->level_group = FALSE;
- ldi->handicap_level = 0;
- ldi->readonly = TRUE;
+ if (ti->type == TREE_TYPE_LEVEL_DIR)
+ {
+ ti->imported_from = getStringCopy(parent->imported_from);
+ ti->imported_by = getStringCopy(parent->imported_by);
+
+ ti->graphics_set_ecs = NULL;
+ ti->graphics_set_aga = NULL;
+ ti->graphics_set = NULL;
+ ti->sounds_set = NULL;
+ ti->music_set = NULL;
+ ti->graphics_path = getStringCopy(UNDEFINED_FILENAME);
+ ti->sounds_path = getStringCopy(UNDEFINED_FILENAME);
+ ti->music_path = getStringCopy(UNDEFINED_FILENAME);
+
+ ti->level_filename = NULL;
+ ti->level_filetype = NULL;
+
+ ti->levels = 0;
+ ti->first_level = 0;
+ ti->last_level = 0;
+ ti->level_group = FALSE;
+ ti->handicap_level = 0;
+ ti->readonly = TRUE;
+ ti->handicap = TRUE;
+ ti->skip_levels = FALSE;
}
-
-
-#else
-
- /* first copy all values from the parent structure ... */
- *ldi = *parent;
-
- /* ... then set all fields to default that cannot be inherited from parent.
- This is especially important for all those fields that can be set from
- the 'levelinfo.conf' config file, because the function 'setSetupInfo()'
- calls 'free()' for all already set token values which requires that no
- other structure's pointer may point to them!
- */
-
- ldi->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->imported_from = getStringCopy(parent->imported_from);
- ldi->class_desc = getStringCopy(parent->class_desc);
-
- ldi->graphics_set = NULL;
- ldi->sounds_set = NULL;
- ldi->music_set = NULL;
- ldi->graphics_path = NULL;
- ldi->sounds_path = NULL;
- ldi->music_path = NULL;
-
- ldi->level_group = FALSE;
- ldi->parent_link = FALSE;
-
- ldi->node_top = parent->node_top;
- ldi->node_parent = parent;
- ldi->node_group = NULL;
- ldi->next = NULL;
-
-#endif
}
-static void freeTreeInfo(TreeInfo *ldi)
+static void freeTreeInfo(TreeInfo *ti)
{
- if (ldi->filename)
- free(ldi->filename);
- if (ldi->fullpath)
- free(ldi->fullpath);
- if (ldi->basepath)
- free(ldi->basepath);
- if (ldi->identifier)
- free(ldi->identifier);
+ checked_free(ti->subdir);
+ checked_free(ti->fullpath);
+ checked_free(ti->basepath);
+ checked_free(ti->identifier);
- if (ldi->name)
- free(ldi->name);
- if (ldi->name_sorting)
- free(ldi->name_sorting);
- if (ldi->author)
- free(ldi->author);
+ checked_free(ti->name);
+ checked_free(ti->name_sorting);
+ checked_free(ti->author);
- if (ldi->class_desc)
- free(ldi->class_desc);
+ checked_free(ti->class_desc);
- if (ldi->type == TREE_TYPE_LEVEL_DIR)
+ checked_free(ti->infotext);
+
+ if (ti->type == TREE_TYPE_LEVEL_DIR)
{
- if (ldi->graphics_set)
- free(ldi->graphics_set);
- if (ldi->sounds_set)
- free(ldi->sounds_set);
- if (ldi->music_set)
- free(ldi->music_set);
+ checked_free(ti->imported_from);
+ checked_free(ti->imported_by);
+
+ checked_free(ti->graphics_set_ecs);
+ checked_free(ti->graphics_set_aga);
+ checked_free(ti->graphics_set);
+ checked_free(ti->sounds_set);
+ checked_free(ti->music_set);
+
+ checked_free(ti->graphics_path);
+ checked_free(ti->sounds_path);
+ checked_free(ti->music_path);
- if (ldi->graphics_path)
- free(ldi->graphics_path);
- if (ldi->sounds_path)
- free(ldi->sounds_path);
- if (ldi->music_path)
- free(ldi->music_path);
+ checked_free(ti->level_filename);
+ checked_free(ti->level_filetype);
}
}
break;
case TYPE_STRING:
- if (*(char **)setup_value != NULL)
- free(*(char **)setup_value);
+ checked_free(*(char **)setup_value);
*(char **)setup_value = getStringCopy(token_value);
break;
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->subdir, "..");
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);
}
{
char *directory_path = getPath2(level_directory, directory_name);
char *filename = getPath2(directory_path, LEVELINFO_FILENAME);
- SetupFileHash *setup_file_hash = loadSetupFileHash(filename);
+ SetupFileHash *setup_file_hash;
LevelDirTree *leveldir_new = NULL;
int i;
+ /* unless debugging, silently ignore directories without "levelinfo.conf" */
+ if (!options.debug && !fileExists(filename))
+ {
+ free(directory_path);
+ free(filename);
+
+ return FALSE;
+ }
+
+ setup_file_hash = loadSetupFileHash(filename);
+
if (setup_file_hash == NULL)
{
Error(ERR_WARN, "ignoring level directory '%s'", directory_path);
else
setTreeInfoToDefaults(leveldir_new, TREE_TYPE_LEVEL_DIR);
- leveldir_new->filename = getStringCopy(directory_name);
+ leveldir_new->subdir = getStringCopy(directory_name);
- checkSetupFileHashIdentifier(setup_file_hash, getCookie("LEVELINFO"));
+ checkSetupFileHashIdentifier(setup_file_hash, filename,
+ getCookie("LEVELINFO"));
/* set all structure fields according to the token/value pairs */
ldi = *leveldir_new;
- for (i=0; i<NUM_LEVELINFO_TOKENS; i++)
+ for (i = 0; i < NUM_LEVELINFO_TOKENS; i++)
setSetupInfo(levelinfo_tokens, i,
getHashEntry(setup_file_hash, levelinfo_tokens[i].text));
*leveldir_new = ldi;
-#if 1
- if (strcmp(leveldir_new->name, ANONYMOUS_NAME) == 0)
- setString(&leveldir_new->name, leveldir_new->filename);
-#else
- if (strcmp(leveldir_new->name, ANONYMOUS_NAME) == 0)
- {
- free(leveldir_new->name);
- leveldir_new->name = getStringCopy(leveldir_new->filename);
- }
-#endif
+ if (strEqual(leveldir_new->name, ANONYMOUS_NAME))
+ setString(&leveldir_new->name, leveldir_new->subdir);
DrawInitText(leveldir_new->name, 150, FC_YELLOW);
if (leveldir_new->identifier == NULL)
- leveldir_new->identifier = getStringCopy(leveldir_new->filename);
+ leveldir_new->identifier = getStringCopy(leveldir_new->subdir);
if (leveldir_new->name_sorting == NULL)
leveldir_new->name_sorting = getStringCopy(leveldir_new->name);
if (node_parent == NULL) /* top level group */
{
leveldir_new->basepath = getStringCopy(level_directory);
- leveldir_new->fullpath = getStringCopy(leveldir_new->filename);
+ leveldir_new->fullpath = getStringCopy(leveldir_new->subdir);
}
else /* sub level group */
{
leveldir_new->fullpath = getPath2(node_parent->fullpath, directory_name);
}
+#if 0
if (leveldir_new->levels < 1)
leveldir_new->levels = 1;
+#endif
leveldir_new->last_level =
leveldir_new->first_level + leveldir_new->levels - 1;
-#if 1
- leveldir_new->user_defined =
- (strcmp(leveldir_new->basepath, options.level_directory) != 0);
-#else
+ leveldir_new->in_user_dir =
+ (!strEqual(leveldir_new->basepath, options.level_directory));
+
+ /* adjust some settings if user's private level directory was detected */
+ if (leveldir_new->sort_priority == LEVELCLASS_UNDEFINED &&
+ leveldir_new->in_user_dir &&
+ (strEqual(leveldir_new->subdir, getLoginName()) ||
+ strEqual(leveldir_new->name, getLoginName()) ||
+ strEqual(leveldir_new->author, getRealName())))
+ {
+ leveldir_new->sort_priority = LEVELCLASS_PRIVATE_START;
+ leveldir_new->readonly = FALSE;
+ }
+
leveldir_new->user_defined =
- (leveldir_new->basepath == options.level_directory ? FALSE : TRUE);
-#endif
+ (leveldir_new->in_user_dir && IS_LEVELCLASS_PRIVATE(leveldir_new));
leveldir_new->color = LEVELCOLOR(leveldir_new);
-#if 1
+
setString(&leveldir_new->class_desc, getLevelClassDescription(leveldir_new));
-#else
- leveldir_new->class_desc = getLevelClassDescription(leveldir_new);
-#endif
leveldir_new->handicap_level = /* set handicap to default value */
- (leveldir_new->user_defined ?
- leveldir_new->last_level :
- leveldir_new->first_level);
+ (leveldir_new->user_defined || !leveldir_new->handicap ?
+ leveldir_new->last_level : leveldir_new->first_level);
+
+#if 0
+ /* !!! don't skip sets without levels (else artwork base sets are missing) */
+#if 1
+ if (leveldir_new->levels < 1 && !leveldir_new->level_group)
+ {
+ /* skip level sets without levels (which are probably artwork base sets) */
+
+ freeSetupFileHash(setup_file_hash);
+ free(directory_path);
+ free(filename);
+
+ return FALSE;
+ }
+#endif
+#endif
pushTreeInfo(node_first, leveldir_new);
char *directory_path = getPath2(level_directory, directory_name);
/* skip entries for current and parent directory */
- if (strcmp(directory_name, ".") == 0 ||
- strcmp(directory_name, "..") == 0)
+ if (strEqual(directory_name, ".") ||
+ strEqual(directory_name, ".."))
{
free(directory_path);
continue;
free(directory_path);
- if (strcmp(directory_name, GRAPHICS_DIRECTORY) == 0 ||
- strcmp(directory_name, SOUNDS_DIRECTORY) == 0 ||
- strcmp(directory_name, MUSIC_DIRECTORY) == 0)
+ if (strEqual(directory_name, GRAPHICS_DIRECTORY) ||
+ strEqual(directory_name, SOUNDS_DIRECTORY) ||
+ strEqual(directory_name, MUSIC_DIRECTORY))
continue;
valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent,
closedir(dir);
- if (!valid_entry_found)
+ /* special case: top level directory may directly contain "levelinfo.conf" */
+ if (node_parent == NULL && !valid_entry_found)
{
/* check if this directory directly contains a file "levelinfo.conf" */
valid_entry_found |= LoadLevelInfoFromLevelConf(node_first, node_parent,
level_directory);
}
+boolean AdjustGraphicsForEMC()
+{
+ boolean settings_changed = FALSE;
+
+ settings_changed |= adjustTreeGraphicsForEMC(leveldir_first_all);
+ settings_changed |= adjustTreeGraphicsForEMC(leveldir_first);
+
+ return settings_changed;
+}
+
void LoadLevelInfo()
{
InitUserLevelDirectory(getLoginName());
LoadLevelInfoFromLevelDir(&leveldir_first, NULL, options.level_directory);
LoadLevelInfoFromLevelDir(&leveldir_first, NULL, getUserLevelDir(NULL));
+ /* after loading all level set information, clone the level directory tree
+ and remove all level sets without levels (these may still contain artwork
+ to be offered in the setup menu as "custom artwork", and are therefore
+ checked for existing artwork in the function "LoadLevelArtworkInfo()") */
+ leveldir_first_all = leveldir_first;
+ cloneTree(&leveldir_first, leveldir_first_all, TRUE);
+
+ AdjustGraphicsForEMC();
+
/* 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);
+ sortTreeInfo(&leveldir_first);
#if 0
dumpTreeInfo(leveldir_first, 0);
TreeInfo *artwork_new = NULL;
int i;
- if (access(filename, F_OK) == 0) /* file exists */
+ if (fileExists(filename))
setup_file_hash = loadSetupFileHash(filename);
if (setup_file_hash == NULL) /* no config file -- look for artwork files */
if (!valid_file_found)
{
- if (strcmp(directory_name, ".") != 0)
+ if (!strEqual(directory_name, "."))
Error(ERR_WARN, "ignoring artwork directory '%s'", directory_path);
free(directory_path);
else
setTreeInfoToDefaults(artwork_new, type);
- artwork_new->filename = getStringCopy(directory_name);
+ artwork_new->subdir = getStringCopy(directory_name);
if (setup_file_hash) /* (before defining ".color" and ".class_desc") */
{
#if 0
- checkSetupFileHashIdentifier(setup_file_hash, getCookie("..."));
+ checkSetupFileHashIdentifier(setup_file_hash, filename, getCookie("..."));
#endif
/* set all structure fields according to the token/value pairs */
ldi = *artwork_new;
- for (i=0; i<NUM_LEVELINFO_TOKENS; i++)
+ for (i = 0; i < NUM_LEVELINFO_TOKENS; i++)
setSetupInfo(levelinfo_tokens, i,
getHashEntry(setup_file_hash, levelinfo_tokens[i].text));
*artwork_new = ldi;
-#if 1
- if (strcmp(artwork_new->name, ANONYMOUS_NAME) == 0)
- setString(&artwork_new->name, artwork_new->filename);
-#else
- if (strcmp(artwork_new->name, ANONYMOUS_NAME) == 0)
- {
- free(artwork_new->name);
- artwork_new->name = getStringCopy(artwork_new->filename);
- }
-#endif
+ if (strEqual(artwork_new->name, ANONYMOUS_NAME))
+ setString(&artwork_new->name, artwork_new->subdir);
#if 0
DrawInitText(artwork_new->name, 150, FC_YELLOW);
#endif
if (artwork_new->identifier == NULL)
- artwork_new->identifier = getStringCopy(artwork_new->filename);
+ artwork_new->identifier = getStringCopy(artwork_new->subdir);
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);
+ artwork_new->fullpath = getStringCopy(artwork_new->subdir);
}
else /* sub level group */
{
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
+ artwork_new->in_user_dir =
+ (!strEqual(artwork_new->basepath, OPTIONS_ARTWORK_DIRECTORY(type)));
/* (may use ".sort_priority" from "setup_file_hash" above) */
artwork_new->color = ARTWORKCOLOR(artwork_new);
-#if 1
+
setString(&artwork_new->class_desc, getLevelClassDescription(artwork_new));
-#else
- artwork_new->class_desc = getLevelClassDescription(artwork_new);
-#endif
if (setup_file_hash == NULL) /* (after determining ".user_defined") */
{
-#if 0
- if (artwork_new->name != NULL)
- {
- free(artwork_new->name);
- artwork_new->name = NULL;
- }
-#endif
-
-#if 0
- if (artwork_new->identifier != NULL)
- {
- free(artwork_new->identifier);
- artwork_new->identifier = NULL;
- }
-#endif
-
- if (strcmp(artwork_new->filename, ".") == 0)
+ if (strEqual(artwork_new->subdir, "."))
{
if (artwork_new->user_defined)
{
-#if 1
setString(&artwork_new->identifier, "private");
-#else
- artwork_new->identifier = getStringCopy("private");
-#endif
artwork_new->sort_priority = ARTWORKCLASS_PRIVATE;
}
else
{
-#if 1
setString(&artwork_new->identifier, "classic");
-#else
- artwork_new->identifier = getStringCopy("classic");
-#endif
artwork_new->sort_priority = ARTWORKCLASS_CLASSICS;
}
/* set to new values after changing ".sort_priority" */
artwork_new->color = ARTWORKCOLOR(artwork_new);
-#if 1
+
setString(&artwork_new->class_desc,
getLevelClassDescription(artwork_new));
-#else
- artwork_new->class_desc = getLevelClassDescription(artwork_new);
-#endif
}
else
{
-#if 1
- setString(&artwork_new->identifier, artwork_new->filename);
-#else
- artwork_new->identifier = getStringCopy(artwork_new->filename);
-#endif
+ setString(&artwork_new->identifier, artwork_new->subdir);
}
-#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);
if ((dir = opendir(base_directory)) == NULL)
{
+ /* display error if directory is main "options.graphics_directory" etc. */
if (base_directory == OPTIONS_ARTWORK_DIRECTORY(type))
Error(ERR_WARN, "cannot read directory '%s'", base_directory);
+
return;
}
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)
+ /* skip directory entries for current and parent directory */
+ if (strEqual(directory_name, ".") ||
+ strEqual(directory_name, ".."))
{
free(directory_path);
continue;
}
- /* find out if directory entry is itself a directory */
+ /* skip directory entries which are not a directory or are not accessible */
if (stat(directory_path, &file_status) != 0 || /* cannot stat file */
(file_status.st_mode & S_IFMT) != S_IFDIR) /* not a directory */
{
free(directory_path);
/* check if this directory contains artwork with or without config file */
- valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first,node_parent,
+ valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first, node_parent,
base_directory,
directory_name, type);
}
closedir(dir);
/* check if this directory directly contains artwork itself */
- valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first,node_parent,
+ valid_entry_found |= LoadArtworkInfoFromArtworkConf(node_first, node_parent,
base_directory, ".",
type);
if (!valid_entry_found)
setTreeInfoToDefaults(artwork_new, type);
-#if 1
- setString(&artwork_new->filename, UNDEFINED_FILENAME);
+ setString(&artwork_new->subdir, UNDEFINED_FILENAME);
setString(&artwork_new->fullpath, UNDEFINED_FILENAME);
setString(&artwork_new->basepath, UNDEFINED_FILENAME);
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 (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;
}
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);
+ sortTreeInfo(&artwork.gfx_first);
+ sortTreeInfo(&artwork.snd_first);
+ sortTreeInfo(&artwork.mus_first);
#if 0
dumpTreeInfo(artwork.gfx_first, 0);
while (level_node)
{
- char *path = getPath2(getLevelDirFromTreeInfo(level_node),
- ARTWORK_DIRECTORY((*artwork_node)->type));
-
-#if 0
- if (!level_node->parent_link)
- printf("CHECKING '%s' ['%s', '%s'] ...\n", path,
- level_node->filename, level_node->name);
-#endif
-
+ /* check all tree entries for artwork, but skip parent link entries */
if (!level_node->parent_link)
{
TreeInfo *topnode_last = *artwork_node;
+ char *path = getPath2(getLevelDirFromTreeInfo(level_node),
+ ARTWORK_DIRECTORY((*artwork_node)->type));
LoadArtworkInfoFromArtworkDir(artwork_node, NULL, path,
(*artwork_node)->type);
free((*artwork_node)->name);
free((*artwork_node)->name_sorting);
- (*artwork_node)->identifier = getStringCopy(level_node->filename);
+ (*artwork_node)->identifier = getStringCopy(level_node->subdir);
(*artwork_node)->name = getStringCopy(level_node->name);
(*artwork_node)->name_sorting = getStringCopy(level_node->name);
(*artwork_node)->sort_priority = level_node->sort_priority;
(*artwork_node)->color = LEVELCOLOR((*artwork_node));
}
- }
- free(path);
+ free(path);
+ }
if (level_node->node_group != NULL)
LoadArtworkInfoFromLevelInfo(artwork_node, level_node->node_group);
{
DrawInitText("Looking for custom level artwork:", 120, FC_GREEN);
- LoadArtworkInfoFromLevelInfo(&artwork.gfx_first, leveldir_first);
- LoadArtworkInfoFromLevelInfo(&artwork.snd_first, leveldir_first);
- LoadArtworkInfoFromLevelInfo(&artwork.mus_first, leveldir_first);
+ LoadArtworkInfoFromLevelInfo(&artwork.gfx_first, leveldir_first_all);
+ LoadArtworkInfoFromLevelInfo(&artwork.snd_first, leveldir_first_all);
+ LoadArtworkInfoFromLevelInfo(&artwork.mus_first, leveldir_first_all);
/* needed for reloading level artwork not known at ealier stage */
- if (strcmp(artwork.gfx_current_identifier, setup.graphics_set) != 0)
+ if (!strEqual(artwork.gfx_current_identifier, setup.graphics_set))
{
artwork.gfx_current =
getTreeInfoFromIdentifier(artwork.gfx_first, setup.graphics_set);
artwork.gfx_current = getFirstValidTreeInfoEntry(artwork.gfx_first);
}
- if (strcmp(artwork.snd_current_identifier, setup.sounds_set) != 0)
+ if (!strEqual(artwork.snd_current_identifier, setup.sounds_set))
{
artwork.snd_current =
getTreeInfoFromIdentifier(artwork.snd_first, setup.sounds_set);
artwork.snd_current = getFirstValidTreeInfoEntry(artwork.snd_first);
}
- if (strcmp(artwork.mus_current_identifier, setup.music_set) != 0)
+ if (!strEqual(artwork.mus_current_identifier, setup.music_set))
{
artwork.mus_current =
getTreeInfoFromIdentifier(artwork.mus_first, setup.music_set);
artwork.mus_current = getFirstValidTreeInfoEntry(artwork.mus_first);
}
- sortTreeInfo(&artwork.gfx_first, compareTreeInfoEntries);
- sortTreeInfo(&artwork.snd_first, compareTreeInfoEntries);
- sortTreeInfo(&artwork.mus_first, compareTreeInfoEntries);
+ sortTreeInfo(&artwork.gfx_first);
+ sortTreeInfo(&artwork.snd_first);
+ sortTreeInfo(&artwork.mus_first);
#if 0
dumpTreeInfo(artwork.gfx_first, 0);
/* always start with reliable default values */
setTreeInfoToDefaults(level_info, TREE_TYPE_LEVEL_DIR);
-#if 1
setString(&level_info->name, getLoginName());
setString(&level_info->author, getRealName());
level_info->levels = 100;
level_info->first_level = 1;
- level_info->sort_priority = LEVELCLASS_PRIVATE_START;
- level_info->readonly = FALSE;
- setString(&level_info->graphics_set, GFX_CLASSIC_SUBDIR);
- setString(&level_info->sounds_set, SND_CLASSIC_SUBDIR);
- setString(&level_info->music_set, MUS_CLASSIC_SUBDIR);
-#else
- ldi.name = getStringCopy(getLoginName());
- ldi.author = getStringCopy(getRealName());
- ldi.levels = 100;
- ldi.first_level = 1;
- ldi.sort_priority = LEVELCLASS_PRIVATE_START;
- ldi.readonly = FALSE;
- ldi.graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR);
- ldi.sounds_set = getStringCopy(SND_CLASSIC_SUBDIR);
- ldi.music_set = getStringCopy(MUS_CLASSIC_SUBDIR);
-#endif
+
+ token_value_position = TOKEN_VALUE_POSITION_SHORT;
fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
getCookie("LEVELINFO")));
ldi = *level_info;
- for (i=0; i<NUM_LEVELINFO_TOKENS; i++)
- if (i != LEVELINFO_TOKEN_IDENTIFIER &&
- i != LEVELINFO_TOKEN_NAME_SORTING &&
- i != LEVELINFO_TOKEN_IMPORTED_FROM)
+ for (i = 0; i < NUM_LEVELINFO_TOKENS; i++)
+ {
+ if (i == LEVELINFO_TOKEN_NAME ||
+ i == LEVELINFO_TOKEN_AUTHOR ||
+ i == LEVELINFO_TOKEN_LEVELS ||
+ i == LEVELINFO_TOKEN_FIRST_LEVEL)
fprintf(file, "%s\n", getSetupLine(levelinfo_tokens, "", i));
+ /* just to make things nicer :) */
+ if (i == LEVELINFO_TOKEN_AUTHOR)
+ fprintf(file, "\n");
+ }
+
+ token_value_position = TOKEN_VALUE_POSITION_DEFAULT;
+
fclose(file);
SetFilePermissions(filename, PERMS_PRIVATE);
strcpy(value_string, (*(boolean *)value ? "yes" : "no"));
break;
+ case TYPE_ECS_AGA:
+ strcpy(value_string, (*(boolean *)value ? "AGA" : "ECS"));
+ break;
+
case TYPE_KEY:
strcpy(value_string, getKeyNameFromKey(*(Key *)value));
break;
break;
}
+ if (type & TYPE_GHOSTED)
+ strcpy(value_string, "n/a");
+
return value_string;
}
char *keyname = getKeyNameFromKey(key);
/* add comment, if useful */
- if (strcmp(keyname, "(undefined)") != 0 &&
- strcmp(keyname, "(unknown)") != 0)
+ if (!strEqual(keyname, "(undefined)") &&
+ !strEqual(keyname, "(unknown)"))
{
/* add at least one whitespace */
strcat(line, " ");
- for (i=strlen(line); i<TOKEN_COMMENT_POSITION; i++)
+ for (i = strlen(line); i < token_comment_position; i++)
strcat(line, " ");
strcat(line, "# ");
if (leveldir_current == NULL)
leveldir_current = getFirstValidTreeInfoEntry(leveldir_first);
- checkSetupFileHashIdentifier(level_setup_hash, getCookie("LEVELSETUP"));
+ checkSetupFileHashIdentifier(level_setup_hash, filename,
+ getCookie("LEVELSETUP"));
freeSetupFileHash(level_setup_hash);
}
/* ----------------------------------------------------------------------- */
char *filename = getPath2(getSetupDir(), LEVELSETUP_FILENAME);
- char *level_subdir = leveldir_current->filename;
+ char *level_subdir = leveldir_current->subdir;
FILE *file;
InitUserDataDirectory();
/* check for more levels besides the 'levels' field of 'levelinfo.conf' */
- level_directory = getPath2((leveldir_current->user_defined ?
+ level_directory = getPath2((leveldir_current->in_user_dir ?
getUserLevelDir(NULL) :
options.level_directory),
leveldir_current->fullpath);
{
if (strlen(dir_entry->d_name) > 4 &&
dir_entry->d_name[3] == '.' &&
- strcmp(&dir_entry->d_name[4], LEVELFILE_EXTENSION) == 0)
+ strEqual(&dir_entry->d_name[4], LEVELFILE_EXTENSION))
{
char levelnum_str[4];
int levelnum_value;
{
char *filename;
SetupFileHash *level_setup_hash = NULL;
- char *level_subdir = leveldir_current->filename;
+ char *level_subdir = leveldir_current->subdir;
/* always start with reliable default values */
level_nr = leveldir_current->first_level;
/* ~/.<program>/levelsetup/<level series>/levelsetup.conf */
/* ----------------------------------------------------------------------- */
- level_subdir = leveldir_current->filename;
+ level_subdir = leveldir_current->subdir;
filename = getPath2(getLevelSetupDir(level_subdir), LEVELSETUP_FILENAME);
if (level_nr > leveldir_current->last_level + 1)
level_nr = leveldir_current->last_level;
- if (leveldir_current->user_defined)
+ if (leveldir_current->user_defined || !leveldir_current->handicap)
level_nr = leveldir_current->last_level;
leveldir_current->handicap_level = level_nr;
}
- checkSetupFileHashIdentifier(level_setup_hash, getCookie("LEVELSETUP"));
+ checkSetupFileHashIdentifier(level_setup_hash, filename,
+ getCookie("LEVELSETUP"));
freeSetupFileHash(level_setup_hash);
}
void SaveLevelSetup_SeriesInfo()
{
char *filename;
- char *level_subdir = leveldir_current->filename;
+ char *level_subdir = leveldir_current->subdir;
char *level_nr_str = int2str(level_nr, 0);
char *handicap_level_str = int2str(leveldir_current->handicap_level, 0);
FILE *file;