X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=29254bb792c0ea0e776388ebcd36737fc4a54c05;hb=2a4f4ada000ade47a2a04e7f7b4d1d67878a2381;hp=a4199a14600fb5083b61ed92e6a45debb1beb0b9;hpb=3fd63fd1559c678f0b63ba48d0de211aab1cf591;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index a4199a14..29254bb7 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -1337,6 +1337,9 @@ static void RedrawGlobalBorderIfNeeded(void)
 
 #if ONLY_REDRAW_GLOBAL_BORDER_IF_NEEDED
   if (CheckIfGlobalBorderRedrawIsNeeded())
+#else
+  // determine and store new global border bitmap for current game status
+  global_border_bitmap = getGlobalBorderBitmapFromStatus(game_status);
 #endif
   {
     // redraw global screen border (or clear, if defined to be empty)
@@ -2817,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)
@@ -2832,6 +2839,9 @@ void ShowEnvelope(int envelope_nr)
   else
     WaitForEventToContinue();
 
+  RemapAllGadgets();
+  SetOverlayEnabled(overlay_enabled);
+
   PlayMenuSoundStereo(sound_closing, SOUND_MIDDLE);
 
   if (anim_mode != ANIM_NONE)
@@ -4193,6 +4203,7 @@ void DrawPlayerField(int x, int y)
 
 void WaitForEventToContinue(void)
 {
+  boolean first_wait = TRUE;
   boolean still_wait = TRUE;
 
   if (program.headless)
@@ -4205,6 +4216,7 @@ void WaitForEventToContinue(void)
   button_status = MB_RELEASED;
 
   ClearEventQueue();
+  ClearPlayerAction();
 
   while (still_wait)
   {
@@ -4214,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;
@@ -4235,7 +4252,8 @@ void WaitForEventToContinue(void)
       still_wait = FALSE;
     }
 
-    BackToFront();
+    if (!PendingEvent())
+      BackToFront();
   }
 }
 
@@ -4447,6 +4465,7 @@ static int RequestHandleEvents(unsigned int req_state)
 	    break;
 	  }
 
+	  case EVENT_FINGERRELEASE:
 	  case EVENT_KEYRELEASE:
 	    ClearPlayerAction();
 	    break;
@@ -5863,6 +5882,39 @@ em_object_mapping_list[GAME_TILE_MAX + 1] =
     EL_EMC_FAKE_ACID,			-1, -1
   },
 
+  {
+    Xfake_acid_1_player,		FALSE,	FALSE,
+    EL_EMC_FAKE_ACID,			-1, -1
+  },
+  {
+    Xfake_acid_2_player,		FALSE,	FALSE,
+    EL_EMC_FAKE_ACID,			-1, -1
+  },
+  {
+    Xfake_acid_3_player,		FALSE,	FALSE,
+    EL_EMC_FAKE_ACID,			-1, -1
+  },
+  {
+    Xfake_acid_4_player,		FALSE,	FALSE,
+    EL_EMC_FAKE_ACID,			-1, -1
+  },
+  {
+    Xfake_acid_5_player,		FALSE,	FALSE,
+    EL_EMC_FAKE_ACID,			-1, -1
+  },
+  {
+    Xfake_acid_6_player,		FALSE,	FALSE,
+    EL_EMC_FAKE_ACID,			-1, -1
+  },
+  {
+    Xfake_acid_7_player,		FALSE,	FALSE,
+    EL_EMC_FAKE_ACID,			-1, -1
+  },
+  {
+    Xfake_acid_8_player,		FALSE,	FALSE,
+    EL_EMC_FAKE_ACID,			-1, -1
+  },
+
   {
     Xgrass,				TRUE,	FALSE,
     EL_EMC_GRASS,			-1, -1
@@ -8755,6 +8807,14 @@ void InitGraphicInfo_EM(void)
 			i == Xfake_acid_6 ? 50 :
 			i == Xfake_acid_7 ? 60 :
 			i == Xfake_acid_8 ? 70 :
+			i == Xfake_acid_1_player ? 0 :
+			i == Xfake_acid_2_player ? 10 :
+			i == Xfake_acid_3_player ? 20 :
+			i == Xfake_acid_4_player ? 30 :
+			i == Xfake_acid_5_player ? 40 :
+			i == Xfake_acid_6_player ? 50 :
+			i == Xfake_acid_7_player ? 60 :
+			i == Xfake_acid_8_player ? 70 :
 			i == Xball_2 ? 7 :
 			i == Yball_2 ? j + 8 :
 			i == Yball_blank ? j + 1 :