X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftools.c;h=d7c3968842a6575759d2c90aa185997735932716;hb=abf8e6bd629101604d463aa8f669b9a5c879440a;hp=7f870a64db40378ebfca13f31fa864c18ff5783f;hpb=766384cc29e6d22af67fe3329069291efc0f681a;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 7f870a64..d7c39688 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -2600,7 +2600,6 @@ void AnimateEnvelopeRequest(int anim_mode, int action)
 
     redraw_mask |= REDRAW_FIELD;
 
-    DoAnimation();
     BackToFront();
 
     SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame);
@@ -2647,9 +2646,6 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
     }
 
     DrawEnvelopeRequest(text);
-
-    if (game_status != GAME_MODE_MAIN)
-      InitAnimation();
   }
 
   game.envelope_active = TRUE;	/* needed for RedrawPlayfield() events */
@@ -2677,20 +2673,12 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
   game.envelope_active = FALSE;
 
   if (action == ACTION_CLOSING)
-  {
-    if (game_status != GAME_MODE_MAIN)
-      StopAnimation();
-
     BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
-  }
 
   // SetDrawBackgroundMask(last_draw_background_mask);
 
   redraw_mask |= REDRAW_FIELD;
 
-  if (game_status == GAME_MODE_MAIN)
-    DoAnimation();
-
   BackToFront();
 
   if (action == ACTION_CLOSING &&
@@ -3553,8 +3541,6 @@ void WaitForEventToContinue()
       still_wait = FALSE;
     }
 
-    DoAnimation();
-
     BackToFront();
   }
 }
@@ -3723,10 +3709,6 @@ static int RequestHandleEvents(unsigned int req_state)
 	BlitBitmap(drawto, bitmap_db_cross, sx, sy, width, height, sx, sy);
       }
     }
-    else
-    {
-      DoAnimation();
-    }
 
     BackToFront();
   }
@@ -3872,17 +3854,11 @@ static boolean RequestDoor(char *text, unsigned int req_state)
     return FALSE;
   }
 
-  if (game_status != GAME_MODE_MAIN)
-    InitAnimation();
-
   SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
 
   // ---------- handle request buttons ----------
   result = RequestHandleEvents(req_state);
 
-  if (game_status != GAME_MODE_MAIN)
-    StopAnimation();
-
   UnmapToolButtons();
 
   if (!(req_state & REQ_STAY_OPEN))
@@ -3977,9 +3953,6 @@ static boolean RequestEnvelope(char *text, unsigned int req_state)
   // ---------- handle request buttons ----------
   result = RequestHandleEvents(req_state);
 
-  if (game_status != GAME_MODE_MAIN)
-    StopAnimation();
-
   UnmapToolButtons();
 
   ShowEnvelopeRequest(text, req_state, ACTION_CLOSING);
@@ -4573,9 +4546,6 @@ unsigned int MoveDoor(unsigned int door_state)
       {
 	BackToFront();
 
-	if (game_status == GAME_MODE_MAIN)
-	  DoAnimation();
-
 	SkipUntilDelayReached(&door_delay, door_delay_value, &k, last_frame);
 
 	current_move_delay += max_step_delay;