X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftoons.c;h=bbbd88333e7fc106abb68146b8efd0d7306177f9;hb=4d4b9cf009d4aefe9e167ac6b838c468513684ab;hp=0b7ca5522c8db2391bb2751b50a3d2d35ae6e812;hpb=e05dda5c8cc6687dcbc59e182a81aed627e262d0;p=rocksndiamonds.git

diff --git a/src/libgame/toons.c b/src/libgame/toons.c
index 0b7ca552..bbbd8833 100644
--- a/src/libgame/toons.c
+++ b/src/libgame/toons.c
@@ -65,7 +65,7 @@ int getAnimationFrame(int num_frames, int delay, int mode, int start_frame,
     /* note: expect different frames for the same delay cycle! */
 
     if (gfx.anim_random_frame < 0)
-      frame = SimpleRND(num_frames);
+      frame = GetSimpleRandom(num_frames);
     else
       frame = gfx.anim_random_frame % num_frames;
   }
@@ -182,11 +182,11 @@ boolean AnimateToon(int toon_nr, boolean restart)
       else if (strEqual(anim->position, "bottom"))
 	pos_y = pos_bottom;
       else if (strEqual(anim->position, "upper"))
-	pos_y = SimpleRND(pos_bottom / 2);
+	pos_y = GetSimpleRandom(pos_bottom / 2);
       else if (strEqual(anim->position, "lower"))
-	pos_y = pos_bottom / 2 + SimpleRND(pos_bottom / 2);
+	pos_y = pos_bottom / 2 + GetSimpleRandom(pos_bottom / 2);
       else
-	pos_y = SimpleRND(pos_bottom);
+	pos_y = GetSimpleRandom(pos_bottom);
 
       if (direction == MV_RIGHT)
       {
@@ -210,7 +210,7 @@ boolean AnimateToon(int toon_nr, boolean restart)
       else if (strEqual(anim->position, "right"))
 	pos_x = pos_right;
       else
-	pos_x = SimpleRND(pos_right);
+	pos_x = GetSimpleRandom(pos_right);
 
       if (direction == MV_DOWN)
       {
@@ -308,7 +308,6 @@ void HandleAnimation(int mode)
   static boolean anim_restart = TRUE;
   static boolean reset_delay = TRUE;
   static int toon_nr = 0;
-  int draw_mode;
 
   if (!setup.toons || screen_info.num_toons == 0)
     return;
@@ -335,15 +334,22 @@ void HandleAnimation(int mode)
       break;
 
     case ANIM_STOP:
-      redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER);
+      if (anim_running)
+      {
+#if 1
+	int draw_mode;
+
+	redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER);
 
-      /* Redraw background even when in direct drawing mode */
-      draw_mode = setup.direct_draw;
-      setup.direct_draw = FALSE;
-      screen_info.update_function();
-      setup.direct_draw = draw_mode;
+	/* Redraw background even when in direct drawing mode */
+	draw_mode = setup.direct_draw;
+	setup.direct_draw = FALSE;
+	screen_info.update_function();
+	setup.direct_draw = draw_mode;
+#endif
 
-      anim_running = FALSE;
+	anim_running = FALSE;
+      }
 
       return;
 
@@ -354,7 +360,7 @@ void HandleAnimation(int mode)
   if (reset_delay)
   {
     animstart_delay = Counter();
-    animstart_delay_value = SimpleRND(3000);
+    animstart_delay_value = GetSimpleRandom(3000);
     reset_delay = FALSE;
   }
 
@@ -363,7 +369,7 @@ void HandleAnimation(int mode)
     if (!DelayReached(&animstart_delay, animstart_delay_value))
       return;
 
-    toon_nr = SimpleRND(screen_info.num_toons);
+    toon_nr = GetSimpleRandom(screen_info.num_toons);
   }
 
   anim_restart = reset_delay = AnimateToon(toon_nr, anim_restart);