X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fimage.c;h=7fc7e2b82bca4edbaad546b5e996ac623b545658;hb=5e13b105ad48e61a5cd46941c61a16ad00445248;hp=7f789cff7d28b14ce7e8b62dc4d0e934c7b59bfa;hpb=1926cad56976542d96a03888d899faac7c2bf442;p=rocksndiamonds.git

diff --git a/src/libgame/image.c b/src/libgame/image.c
index 7f789cff..7fc7e2b8 100644
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -270,7 +270,6 @@ static boolean CheckIfImageContainsSmallImages(ImageInfo *img_info,
   // custom artwork set redefines classic (or default) graphics with wrong tile
   // size (by mistake or by intention), it will be corrected to its original
   // tile size here by forcing complete re-creation of all small images again
-  // (this does not work if different tile sizes are used in same image file)
 
   if (!strEqual(img_info->leveldir, leveldir_current->identifier) &&
       img_info->conf_tile_size != tile_size)
@@ -304,6 +303,16 @@ static boolean CheckIfImageContainsSmallImages(ImageInfo *img_info,
     return FALSE;
   }
 
+  // special case 1 (continued):
+  //
+  // if different tile sizes are used in same image file (usually by mistake,
+  // like forgetting option ".tile_size" for one or more graphic definitions),
+  // make sure to use only the first tile size that is processed for this image
+  // (and ignore all subsequent, potentially different tile size definitions
+  // for this image within the current level set by disabling the above check)
+
+  setString(&img_info->leveldir, leveldir_current->identifier);
+
   // special case 2:
   //
   // graphic config setting "game.tile_size" has changed since last level set;