major cleanup of preprocessor hell

[rocksndiamonds.git] / src / cartoons.c

diff --git a/src/cartoons.c b/src/cartoons.c
index 70d6d3d54ac6a8731eff3a45fd86483fa438b517..a0115cf98dce2b312824186ef95b8ac2afe3c2be 100644 (file)
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2006 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,23 +21,10 @@ static struct ToonInfo toons[MAX_NUM_TOONS];
 
 static void PrepareBackbuffer()
 {
-  if (game_status == GAME_MODE_PLAYING &&
-      level.game_engine_type == GAME_ENGINE_TYPE_EM)
-  {
-    BlitScreenToBitmap_EM(backbuffer);
-
+  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()
@@ -80,11 +65,7 @@ void InitToons()
     toons[i].position = image->parameter[GFX_ARG_POSITION];
   }
 
-#if 1
   InitToonScreen(bitmap_db_toons,
-#else
-  InitToonScreen(bitmap_db_door,
-#endif
                 BackToFront, PrepareBackbuffer, ToonNeedsRedraw,
                 toons, num_toons,
                 REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,