X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fimage.c;h=60c060826c31eda6844d69a4dd22dd03b11f6cc3;hb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;hp=16b4574dab2022311cca9d25931efb07c16f56c5;hpb=fe4ae2ae6dd24628a3141093d8cddea7b57812e1;p=rocksndiamonds.git

diff --git a/src/libgame/image.c b/src/libgame/image.c
index 16b4574d..60c06082 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");
 
@@ -351,11 +358,11 @@ void CreateImageWithSmallImages(int pos, int zoom_factor, int tile_size)
   setString(&img_info->leveldir, leveldir_current->identifier);
 }
 
-static void CreateImageTexturesExt(int pos, boolean force)
+void CreateImageTextures(int pos)
 {
   ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
 
-  if (img_info == NULL || (img_info->contains_textures && !force))
+  if (img_info == NULL || img_info->contains_textures)
     return;
 
   CreateBitmapTextures(img_info->bitmaps);
@@ -363,14 +370,25 @@ static void CreateImageTexturesExt(int pos, boolean force)
   img_info->contains_textures = TRUE;
 }
 
-void CreateImageTextures(int pos)
+void FreeImageTextures(int pos)
 {
-  CreateImageTexturesExt(pos, FALSE);
+  ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
+
+  if (img_info == NULL || !img_info->contains_textures)
+    return;
+
+  FreeBitmapTextures(img_info->bitmaps);
+
+  img_info->contains_textures = FALSE;
 }
 
-void ReCreateImageTextures(int pos)
+void FreeAllImageTextures(void)
 {
-  CreateImageTexturesExt(pos, TRUE);
+  int num_images = getImageListSize();
+  int i;
+
+  for (i = 0; i < num_images; i++)
+    FreeImageTextures(i);
 }
 
 void ScaleImage(int pos, int zoom_factor)
@@ -386,7 +404,7 @@ void ScaleImage(int pos, int zoom_factor)
   img_info->scaled_up = TRUE;
 }
 
-void FreeAllImages()
+void FreeAllImages(void)
 {
   FreeCustomArtworkLists(image_info);
 }