X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=d0bc9fa9401067173c21224ceedbb687af35015d;hb=4fcf5c6436d34bdc44bc534d21d9ec95bf072333;hp=7a55d94de4e5ebf8ae1881ca330828937a9a4a73;hpb=efd0d0abb853018aa3ccc3c727b39bd7f5ba679d;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 7a55d94d..d0bc9fa9 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -28,7 +27,9 @@ #endif #include "misc.h" +#include "setup.h" #include "random.h" +#include "text.h" #if defined(PLATFORM_MSDOS) @@ -111,10 +112,12 @@ static void sleep_milliseconds(unsigned long milliseconds_delay) { boolean do_busy_waiting = (milliseconds_delay < 5 ? TRUE : FALSE); +#if 0 #if defined(PLATFORM_MSDOS) - /* don't use select() to perform waiting operations under DOS/Windows + /* don't use select() to perform waiting operations under DOS environment; always use a busy loop for waiting instead */ do_busy_waiting = TRUE; +#endif #endif if (do_busy_waiting) @@ -134,6 +137,8 @@ static void sleep_milliseconds(unsigned long milliseconds_delay) { #if defined(TARGET_SDL) SDL_Delay(milliseconds_delay); +#elif defined(TARGET_ALLEGRO) + rest(milliseconds_delay); #else struct timeval delay; @@ -156,12 +161,13 @@ boolean FrameReached(unsigned long *frame_counter_var, { unsigned long actual_frame_counter = FrameCounter; - if (actual_frame_counter < *frame_counter_var+frame_delay && + if (actual_frame_counter < *frame_counter_var + frame_delay && actual_frame_counter >= *frame_counter_var) - return(FALSE); + return FALSE; *frame_counter_var = actual_frame_counter; - return(TRUE); + + return TRUE; } boolean DelayReached(unsigned long *counter_var, @@ -171,10 +177,11 @@ boolean DelayReached(unsigned long *counter_var, if (actual_counter < *counter_var + delay && actual_counter >= *counter_var) - return(FALSE); + return FALSE; *counter_var = actual_counter; - return(TRUE); + + return TRUE; } void WaitUntilDelayReached(unsigned long *counter_var, unsigned long delay) @@ -300,12 +307,19 @@ char *getLoginName() #if defined(PLATFORM_WIN32) return ANONYMOUS_NAME; #else - struct passwd *pwd; + static char *login_name = NULL; - if ((pwd = getpwuid(getuid())) == NULL) - return ANONYMOUS_NAME; - else - return pwd->pw_name; + if (login_name == NULL) + { + struct passwd *pwd; + + if ((pwd = getpwuid(getuid())) == NULL) + login_name = ANONYMOUS_NAME; + else + login_name = getStringCopy(pwd->pw_name); + } + + return login_name; #endif } @@ -351,16 +365,16 @@ char *getHomeDir() #if defined(PLATFORM_UNIX) static char *home_dir = NULL; - if (!home_dir) + if (home_dir == NULL) { - if (!(home_dir = getenv("HOME"))) + if ((home_dir = getenv("HOME")) == NULL) { struct passwd *pwd; - if ((pwd = getpwuid(getuid()))) - home_dir = pwd->pw_dir; - else + if ((pwd = getpwuid(getuid())) == NULL) home_dir = "."; + else + home_dir = getStringCopy(pwd->pw_dir); } } @@ -389,6 +403,14 @@ char *getPath3(char *path1, char *path2, char *path3) return complete_path; } +static char *getStringCat2(char *s1, char *s2) +{ + char *complete_string = checked_malloc(strlen(s1) + strlen(s2) + 1); + + sprintf(complete_string, "%s%s", s1, s2); + return complete_string; +} + char *getStringCopy(char *s) { char *s_copy; @@ -414,6 +436,35 @@ char *getStringToLower(char *s) return s_copy; } +static void printUsage() +{ + printf("\n" + "Usage: %s [OPTION]... [HOSTNAME [PORT]]\n" + "\n" + "Options:\n" + " -d, --display HOSTNAME[:SCREEN] specify X server display\n" + " -b, --basepath DIRECTORY alternative base DIRECTORY\n" + " -l, --level DIRECTORY alternative level DIRECTORY\n" + " -g, --graphics DIRECTORY alternative graphics DIRECTORY\n" + " -s, --sounds DIRECTORY alternative sounds DIRECTORY\n" + " -m, --music DIRECTORY alternative music DIRECTORY\n" + " -n, --network network multiplayer game\n" + " --serveronly only start network server\n" + " -v, --verbose verbose mode\n" + " --debug display debugging information\n" + " -e, --execute COMMAND execute batch COMMAND:\n" + "\n" + "Valid commands for '--execute' option:\n" + " \"print graphicsinfo.conf\" print default graphics config\n" + " \"print soundsinfo.conf\" print default sounds config\n" + " \"print musicinfo.conf\" print default music config\n" + " \"dump level FILE\" dump level data from FILE\n" + " \"dump tape FILE\" dump tape data from FILE\n" + " \"autoplay LEVELDIR\" play level tapes for LEVELDIR\n" + "\n", + program.command_basename); +} + void GetOptions(char *argv[]) { char **options_left = &argv[1]; @@ -425,6 +476,10 @@ void GetOptions(char *argv[]) options.ro_base_directory = RO_BASE_PATH; options.rw_base_directory = RW_BASE_PATH; options.level_directory = RO_BASE_PATH "/" LEVELS_DIRECTORY; + options.graphics_directory = RO_BASE_PATH "/" GRAPHICS_DIRECTORY; + options.sounds_directory = RO_BASE_PATH "/" SOUNDS_DIRECTORY; + options.music_directory = RO_BASE_PATH "/" MUSIC_DIRECTORY; + options.execute_command = NULL; options.serveronly = FALSE; options.network = FALSE; options.verbose = FALSE; @@ -466,16 +521,8 @@ void GetOptions(char *argv[]) Error(ERR_EXIT_HELP, "unrecognized option '%s'", option); else if (strncmp(option, "-help", option_len) == 0) { - printf("Usage: %s [options] [server.name [port]]\n" - "Options:\n" - " -d, --display machine:0 X server display\n" - " -b, --basepath directory alternative base directory\n" - " -l, --level directory alternative level directory\n" - " -s, --serveronly only start network server\n" - " -n, --network network multiplayer game\n" - " -v, --verbose verbose mode\n" - " --debug display debugging information\n", - program.command_basename); + printUsage(); + exit(0); } else if (strncmp(option, "-display", option_len) == 0) @@ -511,6 +558,33 @@ void GetOptions(char *argv[]) if (option_arg == next_option) options_left++; } + else if (strncmp(option, "-graphics", option_len) == 0) + { + if (option_arg == NULL) + Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str); + + options.graphics_directory = option_arg; + if (option_arg == next_option) + options_left++; + } + else if (strncmp(option, "-sounds", option_len) == 0) + { + if (option_arg == NULL) + Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str); + + options.sounds_directory = option_arg; + if (option_arg == next_option) + options_left++; + } + else if (strncmp(option, "-music", option_len) == 0) + { + if (option_arg == NULL) + Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str); + + options.music_directory = option_arg; + if (option_arg == next_option) + options_left++; + } else if (strncmp(option, "-network", option_len) == 0) { options.network = TRUE; @@ -527,6 +601,15 @@ void GetOptions(char *argv[]) { options.debug = TRUE; } + else if (strncmp(option, "-execute", option_len) == 0) + { + if (option_arg == NULL) + Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str); + + options.execute_command = option_arg; + if (option_arg == next_option) + options_left++; + } else if (*option == '-') { Error(ERR_EXIT_HELP, "unrecognized option '%s'", option_str); @@ -548,6 +631,23 @@ void GetOptions(char *argv[]) } } +/* used by SetError() and GetError() to store internal error messages */ +static char internal_error[1024]; /* this is bad */ + +void SetError(char *format, ...) +{ + va_list ap; + + va_start(ap, format); + vsprintf(internal_error, format, ap); + va_end(ap); +} + +char *GetError() +{ + return internal_error; +} + void Error(int mode, char *format, ...) { char *process_name = ""; @@ -558,7 +658,7 @@ void Error(int mode, char *format, ...) if (mode & ERR_WARN && !options.verbose) return; -#if !defined(PLATFORM_UNIX) +#if defined(PLATFORM_MSDOS) newline = "\r\n"; if ((error = openErrorFile()) == NULL) @@ -645,6 +745,26 @@ void *checked_realloc(void *ptr, unsigned long size) return ptr; } +inline void swap_numbers(int *i1, int *i2) +{ + int help = *i1; + + *i1 = *i2; + *i2 = help; +} + +inline void swap_number_pairs(int *x1, int *y1, int *x2, int *y2) +{ + int help_x = *x1; + int help_y = *y1; + + *x1 = *x2; + *x2 = help_x; + + *y1 = *y2; + *y2 = help_y; +} + short getFile16BitInteger(FILE *file, int byte_order) { if (byte_order == BYTE_ORDER_BIG_ENDIAN) @@ -731,9 +851,33 @@ void putFileChunk(FILE *file, char *chunk_name, int chunk_size, } } +int getFileVersion(FILE *file) +{ + int version_major, version_minor, version_patch; + + version_major = fgetc(file); + version_minor = fgetc(file); + version_patch = fgetc(file); + fgetc(file); /* not used */ + + return VERSION_IDENT(version_major, version_minor, version_patch); +} + +void putFileVersion(FILE *file, int version) +{ + int version_major = VERSION_MAJOR(version); + int version_minor = VERSION_MINOR(version); + int version_patch = VERSION_PATCH(version); + + fputc(version_major, file); + fputc(version_minor, file); + fputc(version_patch, file); + fputc(0, file); /* not used */ +} + void ReadUnusedBytesFromFile(FILE *file, unsigned long bytes) { - while (bytes--) + while (bytes-- && !feof(file)) fgetc(file); } @@ -743,9 +887,15 @@ void WriteUnusedBytesToFile(FILE *file, unsigned long bytes) fputc(0, file); } + +/* ------------------------------------------------------------------------- */ +/* functions to translate key identifiers between different format */ +/* ------------------------------------------------------------------------- */ + #define TRANSLATE_KEYSYM_TO_KEYNAME 0 #define TRANSLATE_KEYSYM_TO_X11KEYNAME 1 -#define TRANSLATE_X11KEYNAME_TO_KEYSYM 2 +#define TRANSLATE_KEYNAME_TO_KEYSYM 2 +#define TRANSLATE_X11KEYNAME_TO_KEYSYM 3 void translate_keyname(Key *keysym, char **x11name, char **name, int mode) { @@ -871,8 +1021,8 @@ void translate_keyname(Key *keysym, char **x11name, char **name, int mode) sprintf(name_buffer, "%c", '0' + (char)(key - KSYM_0)); else if (key >= KSYM_KP_0 && key <= KSYM_KP_9) sprintf(name_buffer, "keypad %c", '0' + (char)(key - KSYM_KP_0)); - else if (key >= KSYM_F1 && key <= KSYM_F24) - sprintf(name_buffer, "function F%d", (int)(key - KSYM_F1 + 1)); + else if (key >= KSYM_FKEY_FIRST && key <= KSYM_FKEY_LAST) + sprintf(name_buffer, "function F%d", (int)(key - KSYM_FKEY_FIRST + 1)); else if (key == KSYM_UNDEFINED) strcpy(name_buffer, "(undefined)"); else @@ -908,8 +1058,8 @@ void translate_keyname(Key *keysym, char **x11name, char **name, int mode) sprintf(name_buffer, "XK_%c", '0' + (char)(key - KSYM_0)); else if (key >= KSYM_KP_0 && key <= KSYM_KP_9) sprintf(name_buffer, "XK_KP_%c", '0' + (char)(key - KSYM_KP_0)); - else if (key >= KSYM_F1 && key <= KSYM_F24) - sprintf(name_buffer, "XK_F%d", (int)(key - KSYM_F1 + 1)); + else if (key >= KSYM_FKEY_FIRST && key <= KSYM_FKEY_LAST) + sprintf(name_buffer, "XK_F%d", (int)(key - KSYM_FKEY_FIRST + 1)); else if (key == KSYM_UNDEFINED) strcpy(name_buffer, "[undefined]"); else @@ -932,6 +1082,26 @@ void translate_keyname(Key *keysym, char **x11name, char **name, int mode) *x11name = name_buffer; } + else if (mode == TRANSLATE_KEYNAME_TO_KEYSYM) + { + Key key = KSYM_UNDEFINED; + + i = 0; + do + { + if (strcmp(translate_key[i].name, *name) == 0) + { + key = translate_key[i].key; + break; + } + } + while (translate_key[++i].x11name); + + if (key == KSYM_UNDEFINED) + Error(ERR_WARN, "getKeyFromKeyName(): not completely implemented"); + + *keysym = key; + } else if (mode == TRANSLATE_X11KEYNAME_TO_KEYSYM) { Key key = KSYM_UNDEFINED; @@ -965,7 +1135,7 @@ void translate_keyname(Key *keysym, char **x11name, char **name, int mode) ((c2 >= '0' && c1 <= '9') || c2 == '\0')) d = atoi(&name_ptr[4]); - if (d >=1 && d <= 24) + if (d >= 1 && d <= KSYM_NUM_FKEYS) key = KSYM_F1 + (Key)(d - 1); } else if (strncmp(name_ptr, "XK_", 3) == 0) @@ -1033,6 +1203,14 @@ char *getX11KeyNameFromKey(Key key) return x11name; } +Key getKeyFromKeyName(char *name) +{ + Key key; + + translate_keyname(&key, NULL, &name, TRANSLATE_KEYNAME_TO_KEYSYM); + return key; +} + Key getKeyFromX11KeyName(char *x11name) { Key key; @@ -1056,690 +1234,747 @@ char getCharFromKey(Key key) return letter; } + /* ------------------------------------------------------------------------- */ -/* some functions to handle lists of level directories */ +/* functions to translate string identifiers to integer or boolean value */ /* ------------------------------------------------------------------------- */ -struct LevelDirInfo *newLevelDirInfo() +int get_integer_from_string(char *s) { - return checked_calloc(sizeof(struct LevelDirInfo)); + static char *number_text[][3] = + { + { "0", "zero", "null", }, + { "1", "one", "first" }, + { "2", "two", "second" }, + { "3", "three", "third" }, + { "4", "four", "fourth" }, + { "5", "five", "fifth" }, + { "6", "six", "sixth" }, + { "7", "seven", "seventh" }, + { "8", "eight", "eighth" }, + { "9", "nine", "ninth" }, + { "10", "ten", "tenth" }, + { "11", "eleven", "eleventh" }, + { "12", "twelve", "twelfth" }, + }; + + int i, j; + char *s_lower = getStringToLower(s); + int result = -1; + + for (i=0; i<13; i++) + for (j=0; j<3; j++) + if (strcmp(s_lower, number_text[i][j]) == 0) + result = i; + + if (result == -1) + result = atoi(s); + + free(s_lower); + + return result; } -void pushLevelDirInfo(struct LevelDirInfo **node_first, - struct LevelDirInfo *node_new) +boolean get_boolean_from_string(char *s) { - node_new->next = *node_first; - *node_first = node_new; + char *s_lower = getStringToLower(s); + boolean result = FALSE; + + if (strcmp(s_lower, "true") == 0 || + strcmp(s_lower, "yes") == 0 || + strcmp(s_lower, "on") == 0 || + get_integer_from_string(s) == 1) + result = TRUE; + + free(s_lower); + + return result; } -int numLevelDirInfo(struct LevelDirInfo *node) -{ - int num = 0; - while (node) - { - num++; - node = node->next; - } +/* ========================================================================= */ +/* functions for generic lists */ +/* ========================================================================= */ - return num; +ListNode *newListNode() +{ + return checked_calloc(sizeof(ListNode)); } -boolean validLevelSeries(struct LevelDirInfo *node) +void addNodeToList(ListNode **node_first, char *key, void *content) { - return (node != NULL && !node->node_group && !node->parent_link); + ListNode *node_new = newListNode(); + +#if 0 + printf("LIST: adding node with key '%s'\n", key); +#endif + + node_new->key = getStringCopy(key); + node_new->content = content; + node_new->next = *node_first; + *node_first = node_new; } -struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *node) +void deleteNodeFromList(ListNode **node_first, char *key, + void (*destructor_function)(void *)) { - if (node == NULL) - { - if (leveldir_first) /* start with first level directory entry */ - return getFirstValidLevelSeries(leveldir_first); - else - return NULL; - } - else if (node->node_group) /* enter level group (step down into tree) */ - return getFirstValidLevelSeries(node->node_group); - else if (node->parent_link) /* skip start entry of level group */ + if (node_first == NULL || *node_first == NULL) + return; + +#if 0 + printf("[CHECKING LIST KEY '%s' == '%s']\n", + (*node_first)->key, key); +#endif + + if (strcmp((*node_first)->key, key) == 0) { - if (node->next) /* get first real level series entry */ - return getFirstValidLevelSeries(node->next); - else /* leave empty level group and go on */ - return getFirstValidLevelSeries(node->node_parent->next); +#if 0 + printf("[DELETING LIST ENTRY]\n"); +#endif + + free((*node_first)->key); + if (destructor_function) + destructor_function((*node_first)->content); + *node_first = (*node_first)->next; } - else /* this seems to be a regular level series */ - return node; + else + deleteNodeFromList(&(*node_first)->next, key, destructor_function); } -struct LevelDirInfo *getLevelDirInfoFirstGroupEntry(struct LevelDirInfo *node) +ListNode *getNodeFromKey(ListNode *node_first, char *key) { - if (node == NULL) + if (node_first == NULL) return NULL; - if (node->node_parent == NULL) /* top level group */ - return leveldir_first; - else /* sub level group */ - return node->node_parent->node_group; + if (strcmp(node_first->key, key) == 0) + return node_first; + else + return getNodeFromKey(node_first->next, key); } -int numLevelDirInfoInGroup(struct LevelDirInfo *node) +int getNumNodes(ListNode *node_first) { - return numLevelDirInfo(getLevelDirInfoFirstGroupEntry(node)); + return (node_first ? 1 + getNumNodes(node_first->next) : 0); } -int posLevelDirInfo(struct LevelDirInfo *node) +void dumpList(ListNode *node_first) { - struct LevelDirInfo *node_cmp = getLevelDirInfoFirstGroupEntry(node); - int pos = 0; + ListNode *node = node_first; - while (node_cmp) + while (node) { - if (node_cmp == node) - return pos; - - pos++; - node_cmp = node_cmp->next; + printf("['%s' (%d)]\n", node->key, + ((struct ListNodeInfo *)node->content)->num_references); + node = node->next; } - return 0; + printf("[%d nodes]\n", getNumNodes(node_first)); } -struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *node, int pos) + +/* ========================================================================= */ +/* functions for checking filenames */ +/* ========================================================================= */ + +boolean FileIsGraphic(char *filename) { - struct LevelDirInfo *node_default = node; - int pos_cmp = 0; + if (strlen(filename) > 4 && + strcmp(&filename[strlen(filename) - 4], ".pcx") == 0) + return TRUE; - while (node) - { - if (pos_cmp == pos) - return node; + return FALSE; +} - pos_cmp++; - node = node->next; - } +boolean FileIsSound(char *basename) +{ + if (strlen(basename) > 4 && + strcmp(&basename[strlen(basename) - 4], ".wav") == 0) + return TRUE; - return node_default; + return FALSE; } -struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node, - char *filename) +boolean FileIsMusic(char *basename) { - if (filename == NULL) - return NULL; + /* "music" can be a WAV (loop) file or (if compiled with SDL) a MOD file */ - while (node) - { - if (node->node_group) - { - struct LevelDirInfo *node_group; + if (FileIsSound(basename)) + return TRUE; - node_group = getLevelDirInfoFromFilenameExt(node->node_group, filename); +#if defined(TARGET_SDL) + if (strlen(basename) > 4 && + (strcmp(&basename[strlen(basename) - 4], ".mod") == 0 || + strcmp(&basename[strlen(basename) - 4], ".MOD") == 0 || + strncmp(basename, "mod.", 4) == 0 || + strncmp(basename, "MOD.", 4) == 0)) + return TRUE; +#endif - if (node_group) - return node_group; - } - else if (!node->parent_link) - { - if (strcmp(filename, node->filename) == 0) - return node; - } + return FALSE; +} - node = node->next; - } +boolean FileIsArtworkType(char *basename, int type) +{ + if ((type == TREE_TYPE_GRAPHICS_DIR && FileIsGraphic(basename)) || + (type == TREE_TYPE_SOUNDS_DIR && FileIsSound(basename)) || + (type == TREE_TYPE_MUSIC_DIR && FileIsMusic(basename))) + return TRUE; - return NULL; + return FALSE; } -struct LevelDirInfo *getLevelDirInfoFromFilename(char *filename) +/* ========================================================================= */ +/* functions for loading artwork configuration information */ +/* ========================================================================= */ + +static int get_parameter_value(int type, char *value) { - return getLevelDirInfoFromFilenameExt(leveldir_first, filename); + return (type == TYPE_INTEGER ? get_integer_from_string(value) : + type == TYPE_BOOLEAN ? get_boolean_from_string(value) : + -1); } -void dumpLevelDirInfo(struct LevelDirInfo *node, int depth) +struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, + struct ConfigInfo *suffix_list, + int num_file_list_entries) { - int i; + struct FileInfo *file_list; + int num_file_list_entries_found = 0; + int num_suffix_list_entries = 0; + int list_pos = 0; + int i, j; - while (node) - { - for (i=0; ifilename); + for (i=0; suffix_list[i].token != NULL; i++) + num_suffix_list_entries++; - if (node->node_group != NULL) - dumpLevelDirInfo(node->node_group, depth + 1); + /* always start with reliable default values */ + for (i=0; inext; - } -} + if (num_suffix_list_entries > 0) + { + int parameter_array_size = num_suffix_list_entries * sizeof(int); -void sortLevelDirInfo(struct LevelDirInfo **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 i = 0; + file_list[i].default_parameter = checked_calloc(parameter_array_size); + file_list[i].parameter = checked_calloc(parameter_array_size); - if (num_nodes == 0) - return; + for (j=0; jnext; - } + for (j=0; suffix_list[j].token != NULL; j++) + { + int len_suffix = strlen(suffix_list[j].token); - /* sorting the structure pointers in the sorting array */ - qsort(sort_array, num_nodes, sizeof(struct LevelDirInfo *), - compare_function); + if (len_suffix < len_config_token && + strcmp(&config_list[i].token[len_config_token - len_suffix], + suffix_list[j].token) == 0) + { + file_list[list_pos].default_parameter[j] = + get_parameter_value(suffix_list[j].type, config_list[i].value); - /* update the linkage of list elements with the sorted node array */ - for (i=0; inext = sort_array[i + 1]; - sort_array[num_nodes - 1]->next = NULL; + is_file_entry = FALSE; + break; + } + } - /* update the linkage of the main list anchor pointer */ - *node_first = sort_array[0]; + if (is_file_entry) + { + if (i > 0) + list_pos++; - free(sort_array); + if (list_pos >= num_file_list_entries) + break; - /* now recursively sort the level group structures */ - node = *node_first; - while (node) - { - if (node->node_group != NULL) - sortLevelDirInfo(&node->node_group, compare_function); + /* simple sanity check if this is really a file definition */ + if (strcmp(&config_list[i].value[len_config_value - 4], ".pcx") != 0 && + strcmp(&config_list[i].value[len_config_value - 4], ".wav") != 0 && + strcmp(config_list[i].value, UNDEFINED_FILENAME) != 0) + { + Error(ERR_RETURN, "Configuration directive '%s' -> '%s':", + config_list[i].token, config_list[i].value); + Error(ERR_EXIT, "This seems to be no valid definition -- please fix"); + } - node = node->next; + file_list[list_pos].token = config_list[i].token; + file_list[list_pos].default_filename = config_list[i].value; + } } -} -inline void swap_numbers(int *i1, int *i2) -{ - int help = *i1; + num_file_list_entries_found = list_pos + 1; + if (num_file_list_entries_found != num_file_list_entries) + { + Error(ERR_RETURN, "inconsistant config list information:"); + Error(ERR_RETURN, "- should be: %d (according to 'src/conf_gfx.h')", + num_file_list_entries); + Error(ERR_RETURN, "- found to be: %d (according to 'src/conf_gfx.c')", + num_file_list_entries_found); + Error(ERR_EXIT, "please fix"); + } - *i1 = *i2; - *i2 = help; + return file_list; } -inline void swap_number_pairs(int *x1, int *y1, int *x2, int *y2) +#if 0 +static void CheckArtworkConfig(struct ArtworkListInfo *artwork_info) { - int help_x = *x1; - int help_y = *y1; - - *x1 = *x2; - *x2 = help_x; - - *y1 = *y2; - *y2 = help_y; -} + struct FileInfo *file_list = artwork_info->file_list; + struct ConfigInfo *suffix_list = artwork_info->suffix_list; + int num_file_list_entries = artwork_info->num_file_list_entries; + int num_suffix_list_entries = artwork_info->num_suffix_list_entries; + char *filename = getCustomArtworkConfigFilename(artwork_info->type); + struct SetupFileList *setup_file_list; + char *known_token_value = "[KNOWN_TOKEN]"; + int i, j; + if (!options.verbose) + return; -/* ========================================================================= */ -/* some stuff from "files.c" */ -/* ========================================================================= */ + if (filename == NULL) + return; -#if defined(PLATFORM_WIN32) -#ifndef S_IRGRP -#define S_IRGRP S_IRUSR -#endif -#ifndef S_IROTH -#define S_IROTH S_IRUSR -#endif -#ifndef S_IWGRP -#define S_IWGRP S_IWUSR -#endif -#ifndef S_IWOTH -#define S_IWOTH S_IWUSR -#endif -#ifndef S_IXGRP -#define S_IXGRP S_IXUSR -#endif -#ifndef S_IXOTH -#define S_IXOTH S_IXUSR -#endif -#ifndef S_IRWXG -#define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP) -#endif -#ifndef S_ISGID -#define S_ISGID 0 -#endif -#endif /* PLATFORM_WIN32 */ + if ((setup_file_list = loadSetupFileList(filename)) == NULL) + return; -/* file permissions for newly written files */ -#define MODE_R_ALL (S_IRUSR | S_IRGRP | S_IROTH) -#define MODE_W_ALL (S_IWUSR | S_IWGRP | S_IWOTH) -#define MODE_X_ALL (S_IXUSR | S_IXGRP | S_IXOTH) + for (i=0; ivalue, known_token_value) != 0) + { + Error(ERR_RETURN, "custom artwork configuration warning:"); + Error(ERR_RETURN, "- config file: '%s'", filename); + Error(ERR_RETURN, "- config token: '%s'", setup_file_list->token); + Error(ERR_WARN, "token not recognized"); + } - userdata_dir = getPath2(home_dir, data_dir); + setup_file_list = setup_file_list->next; } - return userdata_dir; + freeSetupFileList(setup_file_list); } +#endif -char *getSetupDir() +static void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) { - return getUserDataDir(); -} + struct FileInfo *file_list = artwork_info->file_list; + struct ConfigInfo *suffix_list = artwork_info->suffix_list; + int num_file_list_entries = artwork_info->num_file_list_entries; + int num_suffix_list_entries = artwork_info->num_suffix_list_entries; + char *filename = getCustomArtworkConfigFilename(artwork_info->type); + struct SetupFileList *setup_file_list; + char *known_token_value = "[KNOWN_TOKEN]"; + int i, j; -static mode_t posix_umask(mode_t mask) -{ -#if defined(PLATFORM_UNIX) - return umask(mask); -#else - return 0; +#if 0 + printf("GOT CUSTOM ARTWORK CONFIG FILE '%s'\n", filename); #endif -} -static int posix_mkdir(const char *pathname, mode_t mode) -{ -#if defined(PLATFORM_WIN32) - return mkdir(pathname); -#else - return mkdir(pathname, mode); -#endif -} + /* always start with reliable default values */ + for (i=0; i '9' || - ptr_cookie2[1] != '.' || - ptr_cookie2[2] < '0' || ptr_cookie2[2] > '9') - return -1; + /* mark token as well known from default config */ + setTokenValue(setup_file_list, token, known_token_value); + } - version_major = ptr_cookie2[0] - '0'; - version_minor = ptr_cookie2[2] - '0'; + free(token); + } + } - return VERSION_IDENT(version_major, version_minor, 0); -} + /* set some additional tokens to "known" */ + setTokenValue(setup_file_list, "name", known_token_value); + setTokenValue(setup_file_list, "sort_priority", known_token_value); -boolean checkCookieString(const char *cookie, const char *template) -{ - const char *pattern = "_FILE_VERSION_?.?"; - const int len_cookie = strlen(cookie); - const int len_template = strlen(template); - const int len_pattern = strlen(pattern); + if (options.verbose) + { + /* check each token in config file if it is defined in default config */ + while (setup_file_list != NULL) + { + if (strcmp(setup_file_list->value, known_token_value) != 0) + { + Error(ERR_RETURN, "custom artwork configuration warning:"); + Error(ERR_RETURN, "- config file: '%s'", filename); + Error(ERR_RETURN, "- config token: '%s'", setup_file_list->token); + Error(ERR_WARN, "token not recognized"); + } - if (len_cookie != len_template) - return FALSE; + setup_file_list = setup_file_list->next; + } + } - if (strncmp(cookie, template, len_cookie - len_pattern) != 0) - return FALSE; + freeSetupFileList(setup_file_list); - return TRUE; +#if 0 + for (i=0; i '%s'\n", file_list[i].filename); + else + printf("-> UNDEFINED [-> '%s']\n", file_list[i].default_filename); + } +#endif } -/* ------------------------------------------------------------------------- */ -/* setup file stuff */ -/* ------------------------------------------------------------------------- */ - -static char *string_tolower(char *s) +static void deleteArtworkListEntry(struct ArtworkListInfo *artwork_info, + struct ListNodeInfo **listnode) { - static char s_lower[100]; - int i; + if (*listnode) + { + char *filename = (*listnode)->source_filename; - if (strlen(s) >= 100) - return s; +#if 0 + printf("[decrementing reference counter of artwork '%s']\n", filename); +#endif - strcpy(s_lower, s); + if (--(*listnode)->num_references <= 0) + { +#if 0 + printf("[deleting artwork '%s']\n", filename); +#endif - for (i=0; icontent_list, filename, + artwork_info->free_artwork); + } - return s_lower; + *listnode = NULL; + } } -int get_string_integer_value(char *s) +static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, + struct ListNodeInfo **listnode, + char *basename) { - static char *number_text[][3] = - { - { "0", "zero", "null", }, - { "1", "one", "first" }, - { "2", "two", "second" }, - { "3", "three", "third" }, - { "4", "four", "fourth" }, - { "5", "five", "fifth" }, - { "6", "six", "sixth" }, - { "7", "seven", "seventh" }, - { "8", "eight", "eighth" }, - { "9", "nine", "ninth" }, - { "10", "ten", "tenth" }, - { "11", "eleven", "eleventh" }, - { "12", "twelve", "twelfth" }, + char *init_text[] = + { "", + "Loading graphics:", + "Loading sounds:", + "Loading music:" }; - int i, j; + ListNode *node; + char *filename = getCustomArtworkFilename(basename, artwork_info->type); - for (i=0; i<13; i++) - for (j=0; j<3; j++) - if (strcmp(string_tolower(s), number_text[i][j]) == 0) - return i; + if (filename == NULL) + { + int error_mode = ERR_WARN; - return atoi(s); -} + /* we can get away without sounds and music, but not without graphics */ + if (*listnode == NULL && artwork_info->type == ARTWORK_TYPE_GRAPHICS) + error_mode = ERR_EXIT; -boolean get_string_boolean_value(char *s) -{ - if (strcmp(string_tolower(s), "true") == 0 || - strcmp(string_tolower(s), "yes") == 0 || - strcmp(string_tolower(s), "on") == 0 || - get_string_integer_value(s) == 1) - return TRUE; - else - return FALSE; -} + Error(error_mode, "cannot find artwork file '%s'", basename); + return; + } -char *getFormattedSetupEntry(char *token, char *value) -{ - int i; - static char entry[MAX_LINE_LEN]; + /* check if the old and the new artwork file are the same */ + if (*listnode && strcmp((*listnode)->source_filename, filename) == 0) + { + /* The old and new artwork are the same (have the same filename and path). + This usually means that this artwork does not exist in this artwork set + and a fallback to the existing artwork is done. */ - sprintf(entry, "%s:", token); - for (i=strlen(entry); icontent_list, filename)) != NULL) + { +#if 0 + printf("[artwork '%s' already exists (other list entry)]\n", filename); +#endif - if (setup_file_list->token) - free(setup_file_list->token); - if (setup_file_list->value) - free(setup_file_list->value); - if (setup_file_list->next) - freeSetupFileList(setup_file_list->next); - free(setup_file_list); -} + *listnode = (struct ListNodeInfo *)node->content; + (*listnode)->num_references++; -static struct SetupFileList *newSetupFileList(char *token, char *value) -{ - struct SetupFileList *new = checked_malloc(sizeof(struct SetupFileList)); + return; + } - new->token = checked_malloc(strlen(token) + 1); - strcpy(new->token, token); + DrawInitText(init_text[artwork_info->type], 120, FC_GREEN); + DrawInitText(basename, 150, FC_YELLOW); - new->value = checked_malloc(strlen(value) + 1); - strcpy(new->value, value); + if ((*listnode = artwork_info->load_artwork(filename)) != NULL) + { +#if 0 + printf("[adding new artwork '%s']\n", filename); +#endif - new->next = NULL; + (*listnode)->num_references = 1; + addNodeToList(&artwork_info->content_list, (*listnode)->source_filename, + *listnode); + } + else + { + int error_mode = ERR_WARN; + + /* we can get away without sounds and music, but not without graphics */ + if (artwork_info->type == ARTWORK_TYPE_GRAPHICS) + error_mode = ERR_EXIT; - return new; + Error(error_mode, "cannot load artwork file '%s'", basename); + return; + } } -char *getTokenValue(struct SetupFileList *setup_file_list, char *token) +static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info, + struct ListNodeInfo **listnode, + char *basename) { - if (!setup_file_list) - return NULL; +#if 0 + char *filename = getCustomArtworkFilename(basename, artwork_info->type); +#endif - if (strcmp(setup_file_list->token, token) == 0) - return setup_file_list->value; - else - return getTokenValue(setup_file_list->next, token); -} +#if 0 + printf("GOT CUSTOM ARTWORK FILE '%s'\n", filename); +#endif -static void setTokenValue(struct SetupFileList *setup_file_list, - char *token, char *value) -{ - if (!setup_file_list) + if (strcmp(basename, UNDEFINED_FILENAME) == 0) + { + deleteArtworkListEntry(artwork_info, listnode); return; + } - if (strcmp(setup_file_list->token, token) == 0) +#if 0 + if (filename == NULL) { - free(setup_file_list->value); - setup_file_list->value = checked_malloc(strlen(value) + 1); - strcpy(setup_file_list->value, value); + Error(ERR_WARN, "cannot find artwork file '%s'", basename); + return; } - else if (setup_file_list->next == NULL) - setup_file_list->next = newSetupFileList(token, value); - else - setTokenValue(setup_file_list->next, token, value); + + replaceArtworkListEntry(artwork_info, listnode, filename); +#else + replaceArtworkListEntry(artwork_info, listnode, basename); +#endif } -#ifdef DEBUG -static void printSetupFileList(struct SetupFileList *setup_file_list) +static void LoadArtworkToList(struct ArtworkListInfo *artwork_info, + char *basename, int list_pos) { - if (!setup_file_list) + if (artwork_info->artwork_list == NULL || + list_pos >= artwork_info->num_file_list_entries) return; - printf("token: '%s'\n", setup_file_list->token); - printf("value: '%s'\n", setup_file_list->value); - - printSetupFileList(setup_file_list->next); -} +#if 0 + printf("loading artwork '%s' ... [%d]\n", + basename, getNumNodes(artwork_info->content_list)); #endif -struct SetupFileList *loadSetupFileList(char *filename) -{ - int line_len; - char line[MAX_LINE_LEN]; - char *token, *value, *line_ptr; - struct SetupFileList *setup_file_list = newSetupFileList("", ""); - struct SetupFileList *first_valid_list_entry; + LoadCustomArtwork(artwork_info, &artwork_info->artwork_list[list_pos], + basename); - FILE *file; +#if 0 + printf("loading artwork '%s' done [%d]\n", + basename, getNumNodes(artwork_info->content_list)); +#endif +} - if (!(file = fopen(filename, MODE_READ))) +void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info) +{ +#if 0 + static struct { - Error(ERR_WARN, "cannot open configuration file '%s'", filename); - return NULL; + char *text; + boolean do_it; } - - while(!feof(file)) + draw_init[] = { - /* read next line of input file */ - if (!fgets(line, MAX_LINE_LEN, file)) - break; - - /* cut trailing comment or whitespace from input line */ - for (line_ptr = line; *line_ptr; line_ptr++) - { - if (*line_ptr == '#' || *line_ptr == '\n' || *line_ptr == '\r') - { - *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') - *line_ptr = '\0'; + { "", FALSE }, + { "Loading graphics:", TRUE }, + { "Loading sounds:", TRUE }, + { "Loading music:", TRUE } + }; +#endif - /* ignore empty lines */ - if (*line == '\0') - continue; + int num_file_list_entries = artwork_info->num_file_list_entries; + struct FileInfo *file_list = artwork_info->file_list; + int i; - line_len = strlen(line); +#if 0 + CheckArtworkConfig(artwork_info); +#endif + LoadArtworkConfig(artwork_info); - /* cut leading whitespaces from token */ - for (token = line; *token; token++) - if (*token != ' ' && *token != '\t') - break; +#if 0 + if (draw_init[artwork_info->type].do_it) + DrawInitText(draw_init[artwork_info->type].text, 120, FC_GREEN); +#endif - /* find end of token */ - for (line_ptr = token; *line_ptr; line_ptr++) - { - if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':') - { - *line_ptr = '\0'; - break; - } - } +#if 0 + printf("DEBUG: reloading %d artwork files ...\n", num_file_list_entries); +#endif - if (line_ptr < line + line_len) - value = line_ptr + 1; - else - value = "\0"; + for(i=0; itype].do_it) + DrawInitText(file_list[i].token, 150, FC_YELLOW); +#endif - /* cut leading whitespaces from value */ - for (; *value; value++) - if (*value != ' ' && *value != '\t') - break; + LoadArtworkToList(artwork_info, file_list[i].filename, i); - if (*token && *value) - setTokenValue(setup_file_list, token, value); +#if 0 + printf("DEBUG: loading artwork file '%s'...\n", file_list[i].filename); +#endif } - fclose(file); - - first_valid_list_entry = setup_file_list->next; - - /* free empty list header */ - setup_file_list->next = NULL; - freeSetupFileList(setup_file_list); +#if 0 + draw_init[artwork_info->type].do_it = FALSE; +#endif - if (first_valid_list_entry == NULL) - Error(ERR_WARN, "configuration file '%s' is empty", filename); + /* + printf("list size == %d\n", getNumNodes(artwork_info->content_list)); + */ - return first_valid_list_entry; +#if 0 + dumpList(artwork_info->content_list); +#endif } -void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, - char *identifier) +void FreeCustomArtworkList(struct ArtworkListInfo *artwork_info) { - if (!setup_file_list) + int i; + + if (artwork_info == NULL || artwork_info->artwork_list == NULL) return; - if (strcmp(setup_file_list->token, TOKEN_STR_FILE_IDENTIFIER) == 0) - { - if (strcmp(setup_file_list->value, identifier) != 0) - { - Error(ERR_WARN, "configuration file has wrong version"); - return; - } - else - return; - } +#if 0 + printf("%s: FREEING ARTWORK ...\n", + IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT"); +#endif - if (setup_file_list->next) - checkSetupFileListIdentifier(setup_file_list->next, identifier); - else - { - Error(ERR_WARN, "configuration file has no version information"); - return; - } + for(i=0; inum_file_list_entries; i++) + deleteArtworkListEntry(artwork_info, &artwork_info->artwork_list[i]); + +#if 0 + printf("%s: FREEING ARTWORK -- DONE\n", + IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT"); +#endif + + free(artwork_info->artwork_list); + + artwork_info->artwork_list = NULL; + artwork_info->num_file_list_entries = 0; } /* ========================================================================= */ -/* functions only needed for non-Unix (non-command-line) systems */ +/* functions only needed for non-Unix (non-command-line) systems */ +/* (MS-DOS only; SDL/Windows creates files "stdout.txt" and "stderr.txt") */ /* ========================================================================= */ -#if !defined(PLATFORM_UNIX) +#if defined(PLATFORM_MSDOS) -#define ERROR_FILENAME "error.out" +#define ERROR_FILENAME "stderr.txt" void initErrorFile() { - char *filename; - - InitUserDataDirectory(); - - filename = getPath2(getUserDataDir(), ERROR_FILENAME); - unlink(filename); - free(filename); + unlink(ERROR_FILENAME); } FILE *openErrorFile() { - char *filename; - FILE *error_file; - - filename = getPath2(getUserDataDir(), ERROR_FILENAME); - error_file = fopen(filename, MODE_APPEND); - free(filename); - - return error_file; + return fopen(ERROR_FILENAME, MODE_APPEND); } void dumpErrorFile() { - char *filename; - FILE *error_file; - - filename = getPath2(getUserDataDir(), ERROR_FILENAME); - error_file = fopen(filename, MODE_READ); - free(filename); + FILE *error_file = fopen(ERROR_FILENAME, MODE_READ); if (error_file != NULL) { @@ -1752,6 +1987,21 @@ void dumpErrorFile() #endif +/* ========================================================================= */ +/* some generic helper functions */ +/* ========================================================================= */ + +void printf_line(char line_char, int line_length) +{ + int i; + + for (i=0; i