From: Holger Schemel Date: Mon, 20 Jan 2003 19:15:40 +0000 (+0100) Subject: rnd-20030120-3-src X-Git-Tag: 3.0.0^2~166 X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=3683bbbe90156d2a9ab32de08099e094a446e5f8 rnd-20030120-3-src --- diff --git a/src/conftime.h b/src/conftime.h index 9ece7115..89b3aa24 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-01-20 18:43]" +#define COMPILE_DATE_STRING "[2003-01-20 20:13]" diff --git a/src/libgame/image.c b/src/libgame/image.c index 06634b6e..12bfc916 100644 --- a/src/libgame/image.c +++ b/src/libgame/image.c @@ -767,8 +767,11 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries, /* ---------- initialize artwork reference and content lists ---------- */ + image_info->sizeof_artwork_list_entry = sizeof(ImageInfo *); + image_info->artwork_list = checked_calloc(num_file_list_entries * sizeof(ImageInfo *)); + image_info->dynamic_artwork_list = NULL; image_info->content_list = NULL; @@ -790,5 +793,5 @@ void ReloadCustomImages() void FreeAllImages() { - FreeCustomArtworkList(image_info); + FreeCustomArtworkLists(image_info); } diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 87152ceb..31138a68 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -1499,6 +1499,9 @@ boolean FileIsArtworkType(char *basename, int type) /* functions for loading artwork configuration information */ /* ------------------------------------------------------------------------- */ +static void FreeCustomArtworkList(struct ArtworkListInfo *, + struct ListNodeInfo ***, int *); + static int get_parameter_value(int type, char *value) { return (strcmp(value, ARG_UNDEFINED) == 0 ? ARG_UNDEFINED_VALUE : @@ -1754,6 +1757,9 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) artwork_info->dynamic_file_list = NULL; artwork_info->num_dynamic_file_list_entries = 0; + + FreeCustomArtworkList(artwork_info, &artwork_info->dynamic_artwork_list, + &artwork_info->num_dynamic_file_list_entries); } if (filename == NULL) @@ -1908,6 +1914,13 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info) } } + if (artwork_info->num_dynamic_file_list_entries > 0) + { + artwork_info->dynamic_artwork_list = + checked_calloc(artwork_info->num_dynamic_file_list_entries * + artwork_info->sizeof_artwork_list_entry); + } + if (extra_file_list != NULL && options.verbose && IS_PARENT_PROCESS(audio.mixer_pid)) { @@ -2075,10 +2088,6 @@ static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info, struct ListNodeInfo **listnode, char *basename) { -#if 0 - char *filename = getCustomArtworkFilename(basename, artwork_info->type); -#endif - #if 0 printf("GOT CUSTOM ARTWORK FILE '%s'\n", filename); #endif @@ -2089,33 +2098,30 @@ static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info, return; } -#if 0 - if (filename == NULL) - { - Error(ERR_WARN, "cannot find artwork file '%s'", basename); - return; - } - - replaceArtworkListEntry(artwork_info, listnode, filename); -#else replaceArtworkListEntry(artwork_info, listnode, basename); -#endif } static void LoadArtworkToList(struct ArtworkListInfo *artwork_info, + struct ListNodeInfo **listnode, char *basename, int list_pos) { +#if 0 if (artwork_info->artwork_list == NULL || list_pos >= artwork_info->num_file_list_entries) return; +#endif #if 0 printf("loading artwork '%s' ... [%d]\n", basename, getNumNodes(artwork_info->content_list)); #endif +#if 1 + LoadCustomArtwork(artwork_info, listnode, basename); +#else LoadCustomArtwork(artwork_info, &artwork_info->artwork_list[list_pos], basename); +#endif #if 0 printf("loading artwork '%s' done [%d]\n", @@ -2125,70 +2131,53 @@ static void LoadArtworkToList(struct ArtworkListInfo *artwork_info, void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info) { -#if 0 - static struct - { - char *text; - boolean do_it; - } - draw_init[] = - { - { "", FALSE }, - { "Loading graphics:", TRUE }, - { "Loading sounds:", TRUE }, - { "Loading music:", TRUE } - }; -#endif - - int num_file_list_entries = artwork_info->num_file_list_entries; struct FileInfo *file_list = artwork_info->file_list; + struct FileInfo *dynamic_file_list = artwork_info->dynamic_file_list; + int num_file_list_entries = artwork_info->num_file_list_entries; + int num_dynamic_file_list_entries = + artwork_info->num_dynamic_file_list_entries; int i; #if 0 - LoadArtworkConfig(artwork_info); -#endif - -#if 0 - if (draw_init[artwork_info->type].do_it) - DrawInitText(draw_init[artwork_info->type].text, 120, FC_GREEN); -#endif - -#if 0 - printf("DEBUG: reloading %d artwork files ...\n", num_file_list_entries); + printf("DEBUG: reloading %d static artwork files ...\n", + num_file_list_entries); + printf("DEBUG: reloading %d dynamic artwork files ...\n", + num_dynamic_file_list_entries); #endif for(i=0; itype].do_it) - DrawInitText(file_list[i].token, 150, FC_YELLOW); -#endif + LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i], + file_list[i].filename, i); - LoadArtworkToList(artwork_info, file_list[i].filename, i); - -#if 0 - printf("DEBUG: loading artwork file '%s'...\n", file_list[i].filename); -#endif - } - -#if 0 - draw_init[artwork_info->type].do_it = FALSE; -#endif - - /* - printf("list size == %d\n", getNumNodes(artwork_info->content_list)); - */ + for(i=0; idynamic_artwork_list[i], + dynamic_file_list[i].filename, i); #if 0 dumpList(artwork_info->content_list); #endif } -void FreeCustomArtworkList(struct ArtworkListInfo *artwork_info) +static void FreeCustomArtworkList(struct ArtworkListInfo *artwork_info, + struct ListNodeInfo ***list, + int *num_list_entries) { int i; - if (artwork_info == NULL || artwork_info->artwork_list == NULL) + if (*list == NULL) + return; + + for(i=0; i<*num_list_entries; i++) + deleteArtworkListEntry(artwork_info, &(*list)[i]); + free(*list); + + *list = NULL; + *num_list_entries = 0; +} + +void FreeCustomArtworkLists(struct ArtworkListInfo *artwork_info) +{ + if (artwork_info == NULL) return; #if 0 @@ -2196,18 +2185,16 @@ void FreeCustomArtworkList(struct ArtworkListInfo *artwork_info) 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]); + FreeCustomArtworkList(artwork_info, &artwork_info->artwork_list, + &artwork_info->num_file_list_entries); + + FreeCustomArtworkList(artwork_info, &artwork_info->dynamic_artwork_list, + &artwork_info->num_dynamic_file_list_entries); #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; } diff --git a/src/libgame/misc.h b/src/libgame/misc.h index 92b9cce8..8ce6b8c1 100644 --- a/src/libgame/misc.h +++ b/src/libgame/misc.h @@ -139,7 +139,7 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *, struct ConfigInfo *, int); void LoadArtworkConfig(struct ArtworkListInfo *); void ReloadCustomArtworkList(struct ArtworkListInfo *); -void FreeCustomArtworkList(struct ArtworkListInfo *); +void FreeCustomArtworkLists(struct ArtworkListInfo *); #if !defined(PLATFORM_UNIX) void initErrorFile(); diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 61d5d29e..9b0282bc 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1817,8 +1817,11 @@ void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries, /* ---------- initialize artwork reference and content lists ---------- */ + sound_info->sizeof_artwork_list_entry = sizeof(SoundInfo *); + sound_info->artwork_list = checked_calloc(num_file_list_entries * sizeof(SoundInfo *)); + sound_info->dynamic_artwork_list = NULL; sound_info->content_list = NULL; @@ -2125,7 +2128,7 @@ void FreeMusic(MusicInfo *music) void FreeAllSounds() { - FreeCustomArtworkList(sound_info); + FreeCustomArtworkLists(sound_info); } void FreeAllMusic() diff --git a/src/libgame/system.h b/src/libgame/system.h index 6ba3ff82..b932605b 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -533,7 +533,10 @@ struct ArtworkListInfo char **ext1_suffixes; /* property suffixes array 1 */ char **ext2_suffixes; /* property suffixes array 2 */ + int sizeof_artwork_list_entry; + struct ListNodeInfo **artwork_list; /* static artwork node array */ + struct ListNodeInfo **dynamic_artwork_list; /* dynamic artwrk node array */ struct ListNode *content_list; /* dynamic artwork node list */ void *(*load_artwork)(char *); /* constructor function */