rnd-20030823-2-src

[rocksndiamonds.git] / src / cartoons.c

diff --git a/src/cartoons.c b/src/cartoons.c
index b95525049e6cf613d8ea1b2a2a36f1ee16f30b14..e6892ebb3c28a2addeba225d12ca75066b82f623 100644 (file)
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -24,7 +24,7 @@ static struct ToonInfo toons[MAX_NUM_TOONS];
 static void PrepareBackbuffer()
 {
   /* Fill empty backbuffer for animation functions */
-  if (setup.direct_draw && game_status == PLAYING)
+  if (setup.direct_draw && game_status == GAME_MODE_PLAYING)
   {
     int xx,yy;
 
@@ -38,7 +38,7 @@ static void PrepareBackbuffer()
     SetDrawtoField(DRAW_DIRECT);
   }
 
-  if (setup.soft_scrolling && game_status == PLAYING)
+  if (setup.soft_scrolling && game_status == GAME_MODE_PLAYING)
   {
     int fx = FX, fy = FY;
 
@@ -51,10 +51,16 @@ static void PrepareBackbuffer()
 
 boolean ToonNeedsRedraw()
 {
-  return (game_status == HELPSCREEN ||
-         (game_status == MAINMENU &&
+#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()