X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fimage.c;h=3d959cba8a858407eb759dd8c1a1a7c283071b41;hp=2275bc73544b657313149d1cc9652c4a40484b0f;hb=30eb586d06bc4d1ee7388dced1c20e530292aa93;hpb=d77d7ac6d22b63ff3e10608e54c7ac919915fae9

diff --git a/src/libgame/image.c b/src/libgame/image.c
index 2275bc73..3d959cba 100644
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -86,7 +86,7 @@ static void FreeImage(void *ptr)
   free(image);
 }
 
-int getImageListSize()
+int getImageListSize(void)
 {
   return (image_info->num_file_list_entries +
 	  image_info->num_dynamic_file_list_entries);
@@ -140,6 +140,13 @@ char *getTokenFromImageID(int graphic)
   return (file_list != NULL ? file_list->token : NULL);
 }
 
+char *getFilenameFromImageID(int graphic)
+{
+  struct FileInfo *file_list = getImageListEntryFromImageID(graphic);
+
+  return (file_list != NULL ? file_list->filename : NULL);
+}
+
 int getImageIDFromToken(char *token)
 {
   struct FileInfo *file_list = image_info->file_list;
@@ -153,17 +160,17 @@ int getImageIDFromToken(char *token)
   return -1;
 }
 
-char *getImageConfigFilename()
+char *getImageConfigFilename(void)
 {
   return getCustomArtworkConfigFilename(image_info->type);
 }
 
-int getImageListPropertyMappingSize()
+int getImageListPropertyMappingSize(void)
 {
   return image_info->num_property_mapping_entries;
 }
 
-struct PropertyMapping *getImageListPropertyMapping()
+struct PropertyMapping *getImageListPropertyMapping(void)
 {
   return image_info->property_mapping;
 }
@@ -243,7 +250,7 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
   image_info->free_artwork = FreeImage;
 }
 
-void ReloadCustomImages()
+void ReloadCustomImages(void)
 {
   print_timestamp_init("ReloadCustomImages");
 
@@ -363,6 +370,27 @@ void CreateImageTextures(int pos)
   img_info->contains_textures = TRUE;
 }
 
+static void FreeImageTextures(int pos)
+{
+  ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
+
+  if (img_info == NULL || !img_info->contains_textures)
+    return;
+
+  FreeBitmapTextures(img_info->bitmaps);
+
+  img_info->contains_textures = FALSE;
+}
+
+void FreeAllImageTextures(void)
+{
+  int num_images = getImageListSize();
+  int i;
+
+  for (i = 0; i < num_images; i++)
+    FreeImageTextures(i);
+}
+
 void ScaleImage(int pos, int zoom_factor)
 {
   ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
@@ -376,7 +404,7 @@ void ScaleImage(int pos, int zoom_factor)
   img_info->scaled_up = TRUE;
 }
 
-void FreeAllImages()
+void FreeAllImages(void)
 {
   FreeCustomArtworkLists(image_info);
 }