X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=66083aeb87d888a3a550f65ceb875a4e6bfc760d;hb=fa26d82a378cebf6b519c566c3f33739ebba7823;hp=76bf20c3858a0f7c56a74411f64a90c1bf8e1d5e;hpb=c12ae4bec59aed267be508426df06b948732daec;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 76bf20c3..66083aeb 100644
--- a/src/init.c
+++ b/src/init.c
@@ -701,9 +701,9 @@ void InitElementInfo()
     element_info[i].graphic[GFX_ACTION_DEFAULT] =
       IMG_CHAR_START + (i - EL_CHAR_START);
 
-  for (i=EL_GENERIC_START; i<=EL_GENERIC_END; i++)
+  for (i=EL_CUSTOM_START; i<=EL_CUSTOM_END; i++)
     element_info[i].graphic[GFX_ACTION_DEFAULT] =
-      IMG_GENERIC_START + (i - EL_GENERIC_START);
+      IMG_CUSTOM_START + (i - EL_CUSTOM_START);
 
   i = 0;
   while (element_to_graphic[i].element > -1)
@@ -876,16 +876,34 @@ static void InitGraphicInfo()
     if (src_x < 0 || src_y < 0 ||
 	src_x + TILEX > src_bitmap->width ||
 	src_y + TILEY > src_bitmap->height)
-      Error(ERR_EXIT, "InitGraphicInfo: first frame of graphic animation object %d outside of image bitmap file '%s' (%d,%d)",
-	    i, src_bitmap->source_filename, src_x, src_y);
+    {
+      Error(ERR_RETURN, "custom artwork configuration error:");
+      Error(ERR_RETURN, "- config file: '%s'",
+	    getImageConfigFilename());
+      Error(ERR_RETURN, "- config token: '%s'",
+	    getTokenFromImageID(i));
+      Error(ERR_RETURN, "- image file: '%s'",
+	    src_bitmap->source_filename);
+      Error(ERR_EXIT, "error: first animation frame out of bounds (%d,%d)",
+	    src_x, src_y);
+    }
 
     last_frame = new_graphic_info[i].anim_frames - 1;
     getGraphicSource(i, last_frame, &src_bitmap, &src_x, &src_y);
     if (src_x < 0 || src_y < 0 ||
 	src_x + TILEX > src_bitmap->width ||
 	src_y + TILEY > src_bitmap->height)
-      Error(ERR_EXIT, "InitGraphicInfo: last frame of graphic animation object %d outside of image bitmap file '%s' (%d,%d)",
-	    i, src_bitmap->source_filename, src_x, src_y);
+    {
+      Error(ERR_RETURN, "custom artwork configuration error:");
+      Error(ERR_RETURN, "- config file: '%s'",
+	    getImageConfigFilename());
+      Error(ERR_RETURN, "- config token: '%s'",
+	    getTokenFromImageID(i));
+      Error(ERR_RETURN, "- image file: '%s'",
+	    src_bitmap->source_filename);
+      Error(ERR_EXIT, "error: last animation frame out of bounds (%d,%d)",
+	    src_x, src_y);
+    }
   }
 }