changed setup option to disable global animations to only affect toons

[rocksndiamonds.git] / src / anim.c

diff --git a/src/anim.c b/src/anim.c
index cdc0fd0574363fc39f82a6dd9c19fd5f1060a77d..b651ac6fc5cbe1e31556d82b2585415a6149a180 100644 (file)
--- a/src/anim.c
+++ b/src/anim.c
@@ -780,7 +780,7 @@ static void DrawGlobalAnimationsExt(int drawing_target, int drawing_stage)
   int mode_nr;
   int i;
 
-  if (!setup.toons)
+  if (!setup.global_animations)
     return;
 
   if (drawing_stage == DRAW_GLOBAL_ANIM_STAGE_1 &&
@@ -890,6 +890,11 @@ static void DrawGlobalAnimationsExt(int drawing_target, int drawing_stage)
     int frame;
     int last_anim_random_frame = gfx.anim_random_frame;
 
+    if (!setup.toons &&
+       part->graphic >= IMG_TOON_1 &&
+       part->graphic <= IMG_TOON_20)
+      continue;
+
     // when preparing source fading buffer, only draw animations to be stopped
     if (drawing_target == DRAW_TO_FADE_SOURCE &&
        game_mode_anim_action[part->mode_nr] != ANIM_STOP)