rnd-20051126-1-src

[rocksndiamonds.git] / src / cartoons.c

diff --git a/src/cartoons.c b/src/cartoons.c
index e6892ebb3c28a2addeba225d12ca75066b82f623..aa9667c27fceee45e287694e5dd82ea5a38d60bf 100644 (file)
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -23,16 +23,24 @@ static struct ToonInfo toons[MAX_NUM_TOONS];
 
 static void PrepareBackbuffer()
 {
-  /* Fill empty backbuffer for animation functions */
+  if (game_status == GAME_MODE_PLAYING &&
+      level.game_engine_type == GAME_ENGINE_TYPE_EM)
+  {
+    BlitScreenToBitmap_EM(backbuffer);
+
+    return;
+  }
+
+  /* fill empty backbuffer for animation functions */
   if (setup.direct_draw && game_status == GAME_MODE_PLAYING)
   {
-    int xx,yy;
+    int xx, yy;
 
     SetDrawtoField(DRAW_BACKBUFFER);
 
-    for(xx=0; xx<SCR_FIELDX; xx++)
-      for(yy=0; yy<SCR_FIELDY; yy++)
-       DrawScreenField(xx,yy);
+    for (xx = 0; xx < SCR_FIELDX; xx++)
+      for (yy = 0; yy < SCR_FIELDY; yy++)
+       DrawScreenField(xx, yy);
     DrawAllPlayers();
 
     SetDrawtoField(DRAW_DIRECT);
@@ -45,22 +53,13 @@ static void PrepareBackbuffer()
     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);
+    BlitBitmap(fieldbuffer, backbuffer, fx, fy, SXSIZE, SYSIZE, SX, SY);
   }
 }
 
 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()
@@ -74,7 +73,7 @@ void InitToons()
   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;