rnd-20021230-1-src

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

diff --git a/src/libgame/image.c b/src/libgame/image.c
index a65eb20dbb800368485d57def0dddd051236c328..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;
@@ -700,7 +700,15 @@ struct FileInfo *getCurrentImageList()
   return image_info->file_list;
 }
 
-void InitImageList(struct ConfigInfo *config_list, char *config_suffix_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;
@@ -711,7 +719,7 @@ void InitImageList(struct ConfigInfo *config_list, char *config_suffix_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] != NULL; i++)
+  for (i=0; config_suffix_list[i].token != NULL; i++)
     image_info->num_suffix_list_entries++;
 
   image_info->file_list =