X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=79c2bae71a65c82449c89f881ea05b29bcf63856;hb=8f612b903958b74e46ab7df26a926c28226f2000;hp=a041e1854ac2017d50514fa8493d9d55ed6797c1;hpb=0d46e11e1cb45a68bb9a7031777dc895961975b2;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index a041e185..79c2bae7 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -2820,9 +2820,13 @@ void ShowEnvelope(int envelope_nr)
   int anim_mode = graphic_info[graphic].anim_mode;
   int main_anim_mode = (anim_mode == ANIM_NONE ? ANIM_VERTICAL|ANIM_HORIZONTAL:
 			anim_mode == ANIM_DEFAULT ? ANIM_VERTICAL : anim_mode);
+  boolean overlay_enabled = GetOverlayEnabled();
 
   game.envelope_active = TRUE;	// needed for RedrawPlayfield() events
 
+  SetOverlayEnabled(FALSE);
+  UnmapAllGadgets();
+
   PlayMenuSoundStereo(sound_opening, SOUND_MIDDLE);
 
   if (anim_mode == ANIM_DEFAULT)
@@ -2835,6 +2839,9 @@ void ShowEnvelope(int envelope_nr)
   else
     WaitForEventToContinue();
 
+  RemapAllGadgets();
+  SetOverlayEnabled(overlay_enabled);
+
   PlayMenuSoundStereo(sound_closing, SOUND_MIDDLE);
 
   if (anim_mode != ANIM_NONE)
@@ -4196,6 +4203,7 @@ void DrawPlayerField(int x, int y)
 
 void WaitForEventToContinue(void)
 {
+  boolean first_wait = TRUE;
   boolean still_wait = TRUE;
 
   if (program.headless)
@@ -4208,6 +4216,7 @@ void WaitForEventToContinue(void)
   button_status = MB_RELEASED;
 
   ClearEventQueue();
+  ClearPlayerAction();
 
   while (still_wait)
   {
@@ -4217,17 +4226,22 @@ void WaitForEventToContinue(void)
     {
       switch (event.type)
       {
-	case EVENT_BUTTONRELEASE:
+	case EVENT_BUTTONPRESS:
+        case EVENT_FINGERPRESS:
+	  first_wait = FALSE;
+	  break;
+
+        case EVENT_BUTTONRELEASE:
+        case EVENT_FINGERRELEASE:
+	  still_wait = first_wait;
+	  break;
+
 	case EVENT_KEYPRESS:
         case SDL_CONTROLLERBUTTONDOWN:
         case SDL_JOYBUTTONDOWN:
 	  still_wait = FALSE;
 	  break;
 
-	case EVENT_KEYRELEASE:
-	  ClearPlayerAction();
-	  break;
-
 	default:
 	  HandleOtherEvents(&event);
 	  break;
@@ -4238,7 +4252,8 @@ void WaitForEventToContinue(void)
       still_wait = FALSE;
     }
 
-    BackToFront();
+    if (!PendingEvent())
+      BackToFront();
   }
 }
 
@@ -4450,6 +4465,7 @@ static int RequestHandleEvents(unsigned int req_state)
 	    break;
 	  }
 
+	  case EVENT_FINGERRELEASE:
 	  case EVENT_KEYRELEASE:
 	    ClearPlayerAction();
 	    break;