X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fimage.c;h=3e89c8b196340dfd259d5e469cfb33da1d134c1c;hb=9091c797c4a3abb34ceb98d80a82ae7310708fbb;hp=ec8b0fdcbee349129df4d8dccd91d2bb11d305fb;hpb=fffaec4e69e54c74cf5eea689191e81b8c19b85a;p=rocksndiamonds.git

diff --git a/src/libgame/image.c b/src/libgame/image.c
index ec8b0fdc..3e89c8b1 100644
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -695,19 +695,43 @@ static void FreeImage(void *ptr)
   free(image);
 }
 
-void InitImageList(struct FileInfo *file_list, int num_list_entries)
+struct FileInfo *getCurrentImageList()
 {
-  if (image_info == NULL)
-    image_info = checked_calloc(sizeof(struct ArtworkListInfo));
+  return image_info->file_list;
+}
+
+Bitmap *getBitmapFromImageID(int graphic)
+{
+  ImageInfo **img_info = (ImageInfo **)image_info->artwork_list;
 
-  if (image_info->artwork_list == NULL)
-    image_info->artwork_list =
-      checked_calloc(num_list_entries * sizeof(ImageInfo *));
+  return img_info[graphic]->bitmap;
+}
+
+void InitImageList(struct ConfigInfo *config_list,
+		   struct ConfigInfo *config_suffix_list,
+		   int num_file_list_entries)
+{
+  int i;
+
+  image_info = checked_calloc(sizeof(struct ArtworkListInfo));
 
   image_info->type = ARTWORK_TYPE_GRAPHICS;
-  image_info->num_list_entries = num_list_entries;
-  image_info->file_list = file_list;
+
+  image_info->num_file_list_entries = num_file_list_entries;
+  image_info->num_suffix_list_entries = 0;
+  for (i=0; config_suffix_list[i].token != NULL; i++)
+    image_info->num_suffix_list_entries++;
+
+  image_info->file_list =
+    getFileListFromConfigList(config_list, config_suffix_list,
+			      num_file_list_entries);
+  image_info->suffix_list = config_suffix_list;
+
+  image_info->artwork_list =
+    checked_calloc(num_file_list_entries * sizeof(ImageInfo *));
+
   image_info->content_list = NULL;
+
   image_info->load_artwork = Load_PCX;
   image_info->free_artwork = FreeImage;
 }