X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftoons.c;h=300ae70bf3da93d4f8505d87896424cc7bc3ae13;hb=852a8eef1e8858a40da0be4093eba3deaf468f51;hp=f48621b950bcf60e4f7184fb0b0af2e83a9100f0;hpb=8b04d496646e102dd15710ba091e2f37cadcec5e;p=rocksndiamonds.git

diff --git a/src/libgame/toons.c b/src/libgame/toons.c
index f48621b9..300ae70b 100644
--- a/src/libgame/toons.c
+++ b/src/libgame/toons.c
@@ -125,21 +125,61 @@ void DrawAnim(Bitmap *toon_bitmap, GC toon_clip_gc,
 	      int src_x, int src_y, int width, int height,
 	      int dest_x, int dest_y, int pad_x, int pad_y)
 {
-  int buf_x = DOOR_GFX_PAGEX3, buf_y = DOOR_GFX_PAGEY1;
+  int pad_dest_x = dest_x - pad_x;
+  int pad_dest_y = dest_y - pad_y;
+  int pad_width  = width  + 2 * pad_x;
+  int pad_height = height + 2 * pad_y;
+#if 1
+  int buffer_x = 0;
+  int buffer_y = 0;
+#else
+  int buffer_x = DOOR_GFX_PAGEX3;
+  int buffer_y = DOOR_GFX_PAGEY1;
+#endif
+
+#if 0
+  printf("::: (%d, %d), (%d, %d), (%d, %d), (%d, %d) -> (%d, %d), (%d, %d), (%d, %d)\n",
+	 src_x, src_y,
+	 width, height,
+	 dest_x, dest_y,
+	 pad_x, pad_y,
+
+	 pad_dest_x, pad_dest_y,
+	 pad_width, pad_height,
+	 buffer_x, buffer_y);
+#endif
+
+  /* correct values to avoid off-screen blitting (start position) */
+  if (pad_dest_x < screen_info.startx)
+  {
+    pad_width -= (screen_info.startx - pad_dest_x);
+    pad_dest_x = screen_info.startx;
+  }
+  if (pad_dest_y < screen_info.starty)
+  {
+    pad_height -= (screen_info.starty - pad_dest_y);
+    pad_dest_y = screen_info.starty;
+  }
+
+  /* correct values to avoid off-screen blitting (blit size) */
+  if (pad_width > screen_info.width)
+    pad_width = screen_info.width;
+  if (pad_height > screen_info.height)
+    pad_height = screen_info.height;
 
   /* special method to avoid flickering interference with BackToFront() */
-  BlitBitmap(backbuffer, screen_info.save_buffer, dest_x-pad_x, dest_y-pad_y,
-	     width+2*pad_x, height+2*pad_y, buf_x, buf_y);
-  SetClipOrigin(toon_bitmap, toon_clip_gc, dest_x-src_x, dest_y-src_y);
-  BlitBitmapMasked(toon_bitmap, backbuffer,
-		   src_x, src_y, width, height, dest_x, dest_y);
-  BlitBitmap(backbuffer, window, dest_x-pad_x, dest_y-pad_y,
-	     width+2*pad_x, height+2*pad_y, dest_x-pad_x, dest_y-pad_y);
+  BlitBitmap(backbuffer, screen_info.save_buffer, pad_dest_x, pad_dest_y,
+	     pad_width, pad_height, buffer_x, buffer_y);
+  SetClipOrigin(toon_bitmap, toon_clip_gc, dest_x - src_x, dest_y - src_y);
+  BlitBitmapMasked(toon_bitmap, backbuffer, src_x, src_y, width, height,
+		   dest_x, dest_y);
+  BlitBitmap(backbuffer, window, pad_dest_x, pad_dest_y, pad_width, pad_height,
+	     pad_dest_x, pad_dest_y);
 
   screen_info.update_function();
 
-  BlitBitmap(screen_info.save_buffer, backbuffer, buf_x, buf_y,
-	    width+2*pad_x, height+2*pad_y, dest_x-pad_x, dest_y-pad_y);
+  BlitBitmap(screen_info.save_buffer, backbuffer, buffer_x, buffer_y,
+	     pad_width, pad_height, pad_dest_x, pad_dest_y);
 
   FlushDisplay();
 }
@@ -220,7 +260,7 @@ boolean AnimateToon(int toon_nr, boolean restart)
       else
       {
 	delta_y = -anim->step_offset;
-	pos_y = screen_info.width + delta_y;
+	pos_y = screen_info.height + delta_y;
       }
 
       delta_x = 0;
@@ -308,7 +348,6 @@ void HandleAnimation(int mode)
   static boolean anim_restart = TRUE;
   static boolean reset_delay = TRUE;
   static int toon_nr = 0;
-  int draw_mode;
 
   if (!setup.toons || screen_info.num_toons == 0)
     return;
@@ -337,14 +376,10 @@ void HandleAnimation(int mode)
     case ANIM_STOP:
       if (anim_running)
       {
-#if 0
+#if 1
 	redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER);
 
-	/* Redraw background even when in direct drawing mode */
-	draw_mode = setup.direct_draw;
-	setup.direct_draw = FALSE;
 	screen_info.update_function();
-	setup.direct_draw = draw_mode;
 #endif
 
 	anim_running = FALSE;