fixed bug with non-element graphics while custom game tile size defined

diff --git a/ChangeLog b/ChangeLog
index 332ee32d628a81f1c89f96f3e050772c4dcfee72..cab54d534c035478bac6e80ddd41101d6e64d179 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2014-10-20
        * fixed using buttons on main screen with size other than 32x32 pixels
        * fixed some initialization bugs for scrollbars and main screen buttons
+       * fixed bug when drawing non-element graphics (without separate in-game
+         graphic/bitmap defined) while non-standard game tile size is defined
 
 2014-10-17
        * removed some remaining unused X11 stuff

diff --git a/src/conftime.h b/src/conftime.h
index 44d3b231de9425f997f7fca11398ce1a2a1ea4bb..97a2de1a51ef1126c9a481c70a6318b4113009b0 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2014-10-21 00:38"
+#define COMPILE_DATE_STRING "2014-10-21 01:20"

diff --git a/src/tools.c b/src/tools.c
index a04238724c35f92b03cd788de7ec1efdb411a070..861d6b7afa83f3637a6e11ba2050a7c083f11008 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -1052,6 +1052,10 @@ void getSizedGraphicSourceExt(int graphic, int frame, int tilesize,
   int src_y = g->src_y + (get_backside ? g->offset2_y : 0);
   int tilesize_capped = MIN(MAX(1, tilesize), TILESIZE);
 
+  // if no in-game graphics defined, always use standard graphic size
+  if (g->bitmaps[IMG_BITMAP_GAME] == NULL)
+    tilesize = TILESIZE;
+
   if (tilesize == gfx.standard_tile_size)
     src_bitmap = g->bitmaps[IMG_BITMAP_STANDARD];
   else if (tilesize == game.tile_size)