rocksndiamonds-3.1.2

[rocksndiamonds.git] / src / cartoons.c

diff --git a/src/cartoons.c b/src/cartoons.c
index 9b6626b6cc777b76cb8f06908b968007adc09269..fc465fac037bc4dbb32c49b6d7d40a2a8422c749 100644 (file)
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -59,7 +59,16 @@ static void PrepareBackbuffer()
 
 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()
@@ -67,10 +76,10 @@ 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 = getImageListEntryFromImageID(graphic);