rnd-20021123-1-src

[rocksndiamonds.git] / src / libgame / image.c

diff --git a/src/libgame/image.c b/src/libgame/image.c
index 73e077340e9a35429480a570692146b5a2be0127..8e69de5460a4b518d0c4fb40320abacc0bbd5078 100644 (file)
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -37,8 +37,8 @@ Image *newImage(unsigned int width, unsigned int height, unsigned int depth)
   depth = 8;
 #endif
 
-  image = checked_malloc(sizeof(Image));
-  image->data = checked_malloc(width * height * bytes_per_pixel);
+  image = checked_calloc(sizeof(Image));
+  image->data = checked_calloc(width * height * bytes_per_pixel);
   image->width = width;
   image->height = height;
   image->depth = depth;
@@ -695,19 +695,43 @@ static void FreeImage(void *ptr)
   free(image);
 }
 
-void InitImageList(struct ArtworkConfigInfo *config_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;
+
+  return img_info[graphic]->bitmap;
+}
+
+void InitImageList(struct ConfigInfo *config_list,
+                  struct ConfigInfo *config_suffix_list,
+                  int num_file_list_entries)
+{
+  int i;
 
-  if (image_info->artwork_list == NULL)
-    image_info->artwork_list =
-      checked_calloc(num_list_entries * sizeof(ImageInfo *));
+  image_info = checked_calloc(sizeof(struct ArtworkListInfo));
 
   image_info->type = ARTWORK_TYPE_GRAPHICS;
-  image_info->num_list_entries = num_list_entries;
-  image_info->config_list = config_list;
-  image_info->file_list = NULL;
+
+  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;
 }
@@ -720,3 +744,8 @@ void ReloadCustomImages()
 
   ReloadCustomArtworkList(image_info);
 }
+
+void FreeAllImages()
+{
+  FreeCustomArtworkList(image_info);
+}