X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=f140d4605b1b4e5ffe2d6fd99d1cc6cc5d0e6f14;hb=dce27fe1c087a26e6dac4ef6367012c51810f327;hp=d8140b7e8e09a189909ef7939bdba771ba45114b;hpb=d9ebb78b0e0290d76d3ee3d8f864ac6767cab61e;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index d8140b7e..f140d460 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; @@ -425,10 +447,14 @@ 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.serveronly = FALSE; options.network = FALSE; options.verbose = FALSE; options.debug = FALSE; + options.debug_command = NULL; while (*options_left) { @@ -466,16 +492,23 @@ 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" + printf("Usage: %s [options] [ []]\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" + " -d, --display [:] X server display\n" + " -b, --basepath alternative base directory\n" + " -l, --level alternative level directory\n" + " -g, --graphics alternative graphics directory\n" + " -s, --sounds alternative sounds directory\n" + " -m, --music 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", program.command_basename); + + if (options.debug) + printf(" --debug-command execute special command\n"); + exit(0); } else if (strncmp(option, "-display", option_len) == 0) @@ -511,6 +544,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 +587,15 @@ void GetOptions(char *argv[]) { options.debug = TRUE; } + else if (strncmp(option, "-debug-command", option_len) == 0) + { + if (option_arg == NULL) + Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str); + + options.debug_command = option_arg; + if (option_arg == next_option) + options_left++; + } else if (*option == '-') { Error(ERR_EXIT_HELP, "unrecognized option '%s'", option_str); @@ -548,6 +617,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 +644,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 +731,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) @@ -709,8 +815,11 @@ boolean getFileChunk(FILE *file, char *chunk_name, int *chunk_size, /* read chunk name */ fgets(chunk_name, chunk_name_length + 1, file); - /* read chunk size */ - *chunk_size = getFile32BitInteger(file, byte_order); + if (chunk_size != NULL) + { + /* read chunk size */ + *chunk_size = getFile32BitInteger(file, byte_order); + } return (feof(file) || ferror(file) ? FALSE : TRUE); } @@ -721,13 +830,58 @@ void putFileChunk(FILE *file, char *chunk_name, int chunk_size, /* write chunk name */ fputs(chunk_name, file); - /* write chunk size */ - putFile32BitInteger(file, chunk_size, byte_order); + if (chunk_size >= 0) + { + /* write chunk size */ + putFile32BitInteger(file, chunk_size, byte_order); + } +} + +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-- && !feof(file)) + fgetc(file); } +void WriteUnusedBytesToFile(FILE *file, unsigned long bytes) +{ + while (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) { @@ -853,8 +1007,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 @@ -890,8 +1044,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 @@ -914,6 +1068,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; @@ -947,7 +1121,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) @@ -1015,6 +1189,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; @@ -1038,313 +1220,490 @@ char getCharFromKey(Key key) return letter; } -/* ------------------------------------------------------------------------- */ -/* some functions to handle lists of level directories */ -/* ------------------------------------------------------------------------- */ -struct LevelDirInfo *newLevelDirInfo() +/* ========================================================================= */ +/* functions for generic lists */ +/* ========================================================================= */ + +ListNode *newListNode() { - return checked_calloc(sizeof(struct LevelDirInfo)); + return checked_calloc(sizeof(ListNode)); } -void pushLevelDirInfo(struct LevelDirInfo **node_first, - struct LevelDirInfo *node_new) +void addNodeToList(ListNode **node_first, char *key, void *content) { + 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; } -int numLevelDirInfo(struct LevelDirInfo *node) +void deleteNodeFromList(ListNode **node_first, char *key, + void (*destructor_function)(void *)) { - int num = 0; + if (node_first == NULL || *node_first == NULL) + return; - while (node) +#if 0 + printf("[CHECKING LIST KEY '%s' == '%s']\n", + (*node_first)->key, key); +#endif + + if (strcmp((*node_first)->key, key) == 0) { - num++; - node = node->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 + deleteNodeFromList(&(*node_first)->next, key, destructor_function); +} + +ListNode *getNodeFromKey(ListNode *node_first, char *key) +{ + if (node_first == NULL) + return NULL; - return num; + if (strcmp(node_first->key, key) == 0) + return node_first; + else + return getNodeFromKey(node_first->next, key); } -boolean validLevelSeries(struct LevelDirInfo *node) +int getNumNodes(ListNode *node_first) { - return (node != NULL && !node->node_group && !node->parent_link); + return (node_first ? 1 + getNumNodes(node_first->next) : 0); } -struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *node) +void dumpList(ListNode *node_first) { - 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 */ + ListNode *node = node_first; + + while (node) { - 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); + printf("['%s' (%d)]\n", node->key, + ((struct ListNodeInfo *)node->content)->num_references); + node = node->next; } - else /* this seems to be a regular level series */ - return node; + + printf("[%d nodes]\n", getNumNodes(node_first)); } -struct LevelDirInfo *getLevelDirInfoFirstGroupEntry(struct LevelDirInfo *node) + +/* ========================================================================= */ +/* functions for checking filenames */ +/* ========================================================================= */ + +boolean FileIsGraphic(char *filename) { - if (node == NULL) - return NULL; + if (strlen(filename) > 4 && + strcmp(&filename[strlen(filename) - 4], ".pcx") == 0) + return TRUE; - if (node->node_parent == NULL) /* top level group */ - return leveldir_first; - else /* sub level group */ - return node->node_parent->node_group; + return FALSE; } -int numLevelDirInfoInGroup(struct LevelDirInfo *node) +boolean FileIsSound(char *basename) { - return numLevelDirInfo(getLevelDirInfoFirstGroupEntry(node)); + if (strlen(basename) > 4 && + strcmp(&basename[strlen(basename) - 4], ".wav") == 0) + return TRUE; + + return FALSE; } -int posLevelDirInfo(struct LevelDirInfo *node) +boolean FileIsMusic(char *basename) { - struct LevelDirInfo *node_cmp = getLevelDirInfoFirstGroupEntry(node); - int pos = 0; + /* "music" can be a WAV (loop) file or (if compiled with SDL) a MOD file */ - while (node_cmp) - { - if (node_cmp == node) - return pos; + if (FileIsSound(basename)) + return TRUE; - pos++; - node_cmp = node_cmp->next; - } +#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 - return 0; + return FALSE; } -struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *node, int pos) +boolean FileIsArtworkType(char *basename, int type) { - struct LevelDirInfo *node_default = node; - int pos_cmp = 0; + if ((type == TREE_TYPE_GRAPHICS_DIR && FileIsGraphic(basename)) || + (type == TREE_TYPE_SOUNDS_DIR && FileIsSound(basename)) || + (type == TREE_TYPE_MUSIC_DIR && FileIsMusic(basename))) + return TRUE; - while (node) - { - if (pos_cmp == pos) - return node; - - pos_cmp++; - node = node->next; - } - - return node_default; + return FALSE; } -struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node, - char *filename) +/* ========================================================================= */ +/* functions for loading artwork configuration information */ +/* ========================================================================= */ + +struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list, + struct ConfigInfo *suffix_list, + int num_file_list_entries) { - if (filename == NULL) - return NULL; + struct FileInfo *file_list; + int num_suffix_list_entries = 0; + int list_pos = 0; + int i, j; - while (node) + file_list = checked_calloc(num_file_list_entries * sizeof(struct FileInfo)); + + for (i=0; suffix_list[i].token != NULL; i++) + num_suffix_list_entries++; + + /* always start with reliable default values */ + for (i=0; inode_group) + file_list[i].token = NULL; + file_list[i].default_filename = NULL; + file_list[i].filename = NULL; + + if (num_suffix_list_entries > 0) { - struct LevelDirInfo *node_group; + int parameter_array_size = num_suffix_list_entries * sizeof(int); - node_group = getLevelDirInfoFromFilenameExt(node->node_group, filename); + file_list[i].default_parameter = checked_calloc(parameter_array_size); + file_list[i].parameter = checked_calloc(parameter_array_size); + + for (j=0; jparent_link) + } + + for (i=0; config_list[i].token != NULL; i++) + { + int len_config_token = strlen(config_list[i].token); + boolean is_file_entry = TRUE; + + for (j=0; suffix_list[j].token != NULL; j++) { - if (strcmp(filename, node->filename) == 0) - return node; + int len_suffix = strlen(suffix_list[j].token); + + 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] = atoi(config_list[i].value); + + is_file_entry = FALSE; + break; + } } - node = node->next; + if (is_file_entry) + { + if (i > 0) + list_pos++; + + if (list_pos >= num_file_list_entries) + Error(ERR_EXIT, "inconsistant config list information -- please fix"); + + file_list[list_pos].token = config_list[i].token; + file_list[list_pos].default_filename = config_list[i].value; + } } - return NULL; -} + if (list_pos != num_file_list_entries - 1) + Error(ERR_EXIT, "inconsistant config list information -- please fix"); -struct LevelDirInfo *getLevelDirInfoFromFilename(char *filename) -{ - return getLevelDirInfoFromFilenameExt(leveldir_first, filename); + return file_list; } -void dumpLevelDirInfo(struct LevelDirInfo *node, int depth) +static void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) { - int i; + 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; + int i, j; + +#if 0 + printf("GOT CUSTOM ARTWORK CONFIG FILE '%s'\n", filename); +#endif - while (node) + /* always start with reliable default values */ + for (i=0; ifilename); + for (j=0; jnode_group != NULL) - dumpLevelDirInfo(node->node_group, depth + 1); + if (filename == NULL) + return; - node = node->next; + if ((setup_file_list = loadSetupFileList(filename))) + { + for (i=0; i '%s'\n", file_list[i].filename); + else + printf("-> UNDEFINED [-> '%s']\n", file_list[i].default_filename); + } +#endif } } -void sortLevelDirInfo(struct LevelDirInfo **node_first, - int (*compare_function)(const void *, const void *)) +static void deleteArtworkListEntry(struct ArtworkListInfo *artwork_info, + struct ListNodeInfo **listnode) { - int num_nodes = numLevelDirInfo(*node_first); - struct LevelDirInfo **sort_array; - struct LevelDirInfo *node = *node_first; - int i = 0; + if (*listnode) + { + char *filename = (*listnode)->source_filename; - if (num_nodes == 0) - return; +#if 0 + printf("[decrementing reference counter of artwork '%s']\n", filename); +#endif - /* allocate array for sorting structure pointers */ - sort_array = checked_calloc(num_nodes * sizeof(struct LevelDirInfo *)); + if (--(*listnode)->num_references <= 0) + { +#if 0 + printf("[deleting artwork '%s']\n", filename); +#endif - /* writing structure pointers to sorting array */ - while (i < num_nodes && node) /* double boundary check... */ - { - sort_array[i] = node; + deleteNodeFromList(&artwork_info->content_list, filename, + artwork_info->free_artwork); + } - i++; - node = node->next; + *listnode = NULL; } +} - /* sorting the structure pointers in the sorting array */ - qsort(sort_array, num_nodes, sizeof(struct LevelDirInfo *), - compare_function); +static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, + struct ListNodeInfo **listnode, + char *filename) +{ + ListNode *node; - /* 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; + /* 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. */ - /* update the linkage of the main list anchor pointer */ - *node_first = sort_array[0]; +#if 0 + printf("[artwork '%s' already exists (same list entry)]\n", filename); +#endif - free(sort_array); + return; + } - /* now recursively sort the level group structures */ - node = *node_first; - while (node) + /* delete existing artwork file entry */ + deleteArtworkListEntry(artwork_info, listnode); + + /* check if the new artwork file already exists in the list of artworks */ + if ((node = getNodeFromKey(artwork_info->content_list, filename)) != NULL) { - if (node->node_group != NULL) - sortLevelDirInfo(&node->node_group, compare_function); +#if 0 + printf("[artwork '%s' already exists (other list entry)]\n", filename); +#endif - node = node->next; + *listnode = (struct ListNodeInfo *)node->content; + (*listnode)->num_references++; + } + else if ((*listnode = artwork_info->load_artwork(filename)) != NULL) + { + (*listnode)->num_references = 1; + addNodeToList(&artwork_info->content_list, (*listnode)->source_filename, + *listnode); } } -inline void swap_numbers(int *i1, int *i2) +static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info, + struct ListNodeInfo **listnode, + char *basename) { - int help = *i1; + char *filename = getCustomArtworkFilename(basename, artwork_info->type); - *i1 = *i2; - *i2 = help; +#if 0 + printf("GOT CUSTOM ARTWORK FILE '%s'\n", filename); +#endif + + if (strcmp(basename, UNDEFINED_FILENAME) == 0) + { + deleteArtworkListEntry(artwork_info, listnode); + return; + } + + if (filename == NULL) + { + Error(ERR_WARN, "cannot find artwork file '%s'", basename); + return; + } + + replaceArtworkListEntry(artwork_info, listnode, filename); } -inline void swap_number_pairs(int *x1, int *y1, int *x2, int *y2) +static void LoadArtworkToList(struct ArtworkListInfo *artwork_info, + char *basename, int list_pos) { - int help_x = *x1; - int help_y = *y1; + if (artwork_info->artwork_list == NULL || + list_pos >= artwork_info->num_file_list_entries) + return; - *x1 = *x2; - *x2 = help_x; +#if 0 + printf("loading artwork '%s' ... [%d]\n", + basename, getNumNodes(artwork_info->content_list)); +#endif - *y1 = *y2; - *y2 = help_y; + LoadCustomArtwork(artwork_info, &artwork_info->artwork_list[list_pos], + basename); + +#if 0 + printf("loading artwork '%s' done [%d]\n", + basename, getNumNodes(artwork_info->content_list)); +#endif } +void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info) +{ + static struct + { + char *text; + boolean do_it; + } + draw_init[] = + { + { "", FALSE }, + { "Loading graphics:", TRUE }, + { "Loading sounds:", TRUE }, + { "Loading music:", TRUE } + }; -/* ========================================================================= */ -/* some stuff from "files.c" */ -/* ========================================================================= */ + int num_file_list_entries = artwork_info->num_file_list_entries; + struct FileInfo *file_list = artwork_info->file_list; + int i; -#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) -#define USERDATA_DIR_MODE (MODE_R_ALL | MODE_X_ALL | S_IWUSR) + LoadArtworkConfig(artwork_info); -char *getUserDataDir(void) -{ - static char *userdata_dir = NULL; + if (draw_init[artwork_info->type].do_it) + DrawInitText(draw_init[artwork_info->type].text, 120, FC_GREEN); + +#if 0 + printf("DEBUG: reloading %d artwork files ...\n", num_file_list_entries); +#endif - if (!userdata_dir) + for(i=0; itype].do_it) + DrawInitText(file_list[i].token, 150, FC_YELLOW); - userdata_dir = getPath2(home_dir, data_dir); + LoadArtworkToList(artwork_info, file_list[i].filename, i); } - return userdata_dir; -} + draw_init[artwork_info->type].do_it = FALSE; -void createDirectory(char *dir, char *text) -{ - if (access(dir, F_OK) != 0) -#if defined(PLATFORM_WIN32) - if (mkdir(dir) != 0) -#else - if (mkdir(dir, USERDATA_DIR_MODE) != 0) + /* + printf("list size == %d\n", getNumNodes(artwork_info->content_list)); + */ + +#if 0 + dumpList(artwork_info->content_list); #endif - Error(ERR_WARN, "cannot create %s directory '%s'", text, dir); } -void InitUserDataDirectory() +void FreeCustomArtworkList(struct ArtworkListInfo *artwork_info) { - createDirectory(getUserDataDir(), "user data"); + int i; + + if (artwork_info->artwork_list == NULL) + return; + +#if 0 + printf("%s: FREEING ARTWORK ...\n", + IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT"); +#endif + + 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) {