X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fcartoons.c;h=a0115cf98dce2b312824186ef95b8ac2afe3c2be;hp=e6892ebb3c28a2addeba225d12ca75066b82f623;hb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181;hpb=80b3b0a5109b5678a9a921fcd1b4f7046e5e76d0

diff --git a/src/cartoons.c b/src/cartoons.c
index e6892ebb..a0115cf9 100644
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* cartoons.c                                               *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// cartoons.c
+// ============================================================================
 
 #include "cartoons.h"
 #include "main.h"
@@ -23,44 +21,15 @@ static struct ToonInfo toons[MAX_NUM_TOONS];
 
 static void PrepareBackbuffer()
 {
-  /* Fill empty backbuffer for animation functions */
-  if (setup.direct_draw && game_status == GAME_MODE_PLAYING)
-  {
-    int xx,yy;
-
-    SetDrawtoField(DRAW_BACKBUFFER);
-
-    for(xx=0; xx<SCR_FIELDX; xx++)
-      for(yy=0; yy<SCR_FIELDY; yy++)
-	DrawScreenField(xx,yy);
-    DrawAllPlayers();
-
-    SetDrawtoField(DRAW_DIRECT);
-  }
+  if (game_status != GAME_MODE_PLAYING)
+    return;
 
-  if (setup.soft_scrolling && game_status == GAME_MODE_PLAYING)
-  {
-    int fx = FX, fy = FY;
-
-    fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
-    fy += (ScreenMovDir & (MV_UP|MV_DOWN)    ? ScreenGfxPos : 0);
-
-    BlitBitmap(fieldbuffer, backbuffer, fx,fy, SXSIZE,SYSIZE, SX,SY);
-  }
+  BlitScreenToBitmap(backbuffer);
 }
 
 boolean ToonNeedsRedraw()
 {
-#if 1
   return TRUE;
-#else
-  return (game_status == GAME_MODE_INFO ||
-	  game_status == GAME_MODE_LEVELS ||
-	  game_status == GAME_MODE_SETUP ||
-	  (game_status == GAME_MODE_MAIN &&
-	   ((redraw_mask & REDRAW_MICROLEVEL) ||
-	    (redraw_mask & REDRAW_MICROLABEL))));
-#endif
 }
 
 void InitToons()
@@ -68,13 +37,13 @@ void InitToons()
   int num_toons = MAX_NUM_TOONS;
   int i;
 
-  if (global.num_toons > 0 && global.num_toons < MAX_NUM_TOONS)
+  if (global.num_toons >= 0 && global.num_toons < MAX_NUM_TOONS)
     num_toons = global.num_toons;
 
-  for (i=0; i < num_toons; i++)
+  for (i = 0; i < num_toons; i++)
   {
     int graphic = IMG_TOON_1 + i;
-    struct FileInfo *image = getImageListEntry(graphic);
+    struct FileInfo *image = getImageListEntryFromImageID(graphic);
 
     toons[i].bitmap = graphic_info[graphic].bitmap;
 
@@ -96,7 +65,7 @@ void InitToons()
     toons[i].position = image->parameter[GFX_ARG_POSITION];
   }
 
-  InitToonScreen(bitmap_db_door,
+  InitToonScreen(bitmap_db_toons,
 		 BackToFront, PrepareBackbuffer, ToonNeedsRedraw,
 		 toons, num_toons,
 		 REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,