X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fimage.c;h=d6e3013ce4be6aff07941727e99d65177342e740;hb=601cca5b35649856ff49e1bcb3806592b736662c;hp=64dc3c416d4fe11a4fdd5eea5a8f64e3213041d2;hpb=ab0c2cf87c09fdc785f5124640a9f3334bb3a4b4;p=rocksndiamonds.git

diff --git a/src/libgame/image.c b/src/libgame/image.c
index 64dc3c41..d6e3013c 100644
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -708,6 +708,7 @@ struct ImageInfo
   int num_references;
 
   Bitmap *bitmap;
+  boolean contains_small_images;
 };
 typedef struct ImageInfo ImageInfo;
 
@@ -733,6 +734,8 @@ static void *Load_PCX(char *filename)
 
   img_info->source_filename = getStringCopy(filename);
 
+  img_info->contains_small_images = FALSE;
+
   return img_info;
 }
 
@@ -767,8 +770,20 @@ struct FileInfo *getImageListEntry(int pos)
 	  &image_info->dynamic_file_list[list_pos]);
 }
 
+static ImageInfo *getImageInfoEntryFromImageID(int pos)
+{
+  int num_list_entries = image_info->num_file_list_entries;
+  int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+  ImageInfo **img_info =
+    (ImageInfo **)(pos < num_list_entries ? image_info->artwork_list :
+		   image_info->dynamic_artwork_list);
+
+  return img_info[list_pos];
+}
+
 Bitmap *getBitmapFromImageID(int pos)
 {
+#if 0
   int num_list_entries = image_info->num_file_list_entries;
   int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
   ImageInfo **img_info =
@@ -776,6 +791,11 @@ Bitmap *getBitmapFromImageID(int pos)
 		   image_info->dynamic_artwork_list);
 
   return (img_info[list_pos] != NULL ? img_info[list_pos]->bitmap : NULL);
+#else
+  ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
+
+  return (img_info != NULL ? img_info->bitmap : NULL);
+#endif
 }
 
 char *getTokenFromImageID(int graphic)
@@ -804,7 +824,8 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
 		   struct ConfigInfo *config_suffix_list,
 		   char **base_prefixes,
 		   char **ext1_suffixes,
-		   char **ext2_suffixes)
+		   char **ext2_suffixes,
+		   char **ext3_suffixes)
 {
   int i;
 
@@ -841,9 +862,14 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
   for (i=0; ext2_suffixes[i] != NULL; i++)
     image_info->num_ext2_suffixes++;
 
+  image_info->num_ext3_suffixes = 0;
+  for (i=0; ext3_suffixes[i] != NULL; i++)
+    image_info->num_ext3_suffixes++;
+
   image_info->base_prefixes = base_prefixes;
   image_info->ext1_suffixes = ext1_suffixes;
   image_info->ext2_suffixes = ext2_suffixes;
+  image_info->ext3_suffixes = ext3_suffixes;
 
   image_info->num_property_mapping_entries = 0;
 
@@ -865,23 +891,6 @@ void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
   image_info->free_artwork = FreeImage;
 }
 
-void dumpImages()
-{
-  struct ListNode *node;
-
-  if (image_info->content_list == NULL)
-    return;
-
-  for (node = image_info->content_list; node != NULL; node = node->next)
-  {
-    ImageInfo *img_info = (ImageInfo *)node->content;
-
-    printf("---> '%s' [%d]\n",
-	   img_info->source_filename,
-	   img_info->num_references);
-  }
-}
-
 void ReloadCustomImages()
 {
 #if 0
@@ -890,8 +899,18 @@ void ReloadCustomImages()
 
   LoadArtworkConfig(image_info);
   ReloadCustomArtworkList(image_info);
+}
+
+void CreateImageWithSmallImages(int pos)
+{
+  ImageInfo *img_info = getImageInfoEntryFromImageID(pos);
+
+  if (img_info == NULL || img_info->contains_small_images)
+    return;
+
+  CreateBitmapWithSmallBitmaps(img_info->bitmap);
 
-  dumpImages();
+  img_info->contains_small_images = TRUE;
 }
 
 void FreeAllImages()