rnd-20030118-1-src

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

diff --git a/src/libgame/image.c b/src/libgame/image.c
index a649e40abb864e45c5a4e2136a2ffdbf920b3f3d..ce66e3280b43eaed02485317de4edeff0d7e5aef 100644 (file)
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -705,7 +705,7 @@ Bitmap *getBitmapFromImageID(int graphic)
 {
   ImageInfo **img_info = (ImageInfo **)image_info->artwork_list;
 
-  return img_info[graphic]->bitmap;
+  return (img_info[graphic] != NULL ? img_info[graphic]->bitmap : NULL);
 }
 
 char *getTokenFromImageID(int graphic)
@@ -739,6 +739,7 @@ void InitImageList(struct ConfigInfo *config_list,
     getFileListFromConfigList(config_list, config_suffix_list,
                              num_file_list_entries);
   image_info->suffix_list = config_suffix_list;
+  image_info->custom_setup_list = NULL;
 
   image_info->artwork_list =
     checked_calloc(num_file_list_entries * sizeof(ImageInfo *));