X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fimage.c;h=925147aba8908c58d4f07180eb3f4199d9e8f010;hb=2bcba5d4d363ba2f58c9d3f22aba6a455522f499;hp=3fb28c927f104d25a711708f95e4d6b0781c6072;hpb=684f9040af5b97bc73676f8f8198688d87c3ea25;p=rocksndiamonds.git

diff --git a/src/libgame/image.c b/src/libgame/image.c
index 3fb28c92..925147ab 100644
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -718,7 +718,7 @@ static void *Load_PCX(char *filename)
 {
   ImageInfo *img_info;
 
-#if 1
+#if 0
   printf("loading PCX file '%s'\n", filename);
 #endif
 
@@ -800,9 +800,16 @@ Bitmap *getBitmapFromImageID(int pos)
 
 char *getTokenFromImageID(int graphic)
 {
+#if 0
+  /* !!! this does not work for dynamic artwork (crash!) !!! */
   struct FileInfo *file_list = (struct FileInfo *)image_info->file_list;
 
   return file_list[graphic].token;
+#else
+  struct FileInfo *file_list = getImageListEntry(graphic);
+
+  return (file_list != NULL ? file_list->token : NULL);
+#endif
 }
 
 char *getImageConfigFilename()