X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=95bc7a45ac7bbdc8a83c1e6267b8314f43c446b4;hb=cff0c254d160d92dbd6151f6110b1ed9dfec6296;hp=1dc4f4bcbaffd397ead329690d9c5a27d357d8e4;hpb=d2b08e8601362bd9f1ade63c9bca892aab0e410e;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 1dc4f4bc..95bc7a45 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -334,11 +334,6 @@ void DrawMaskedBorder(int redraw_mask)
       effectiveGameStatus() == GAME_MODE_TITLE)
     return;
 
-  /* never draw masked screen borders when displaying request outside door */
-  if (effectiveGameStatus() == GAME_MODE_PSEUDO_DOOR &&
-      global.use_envelope_request)
-    return;
-
   if (redraw_mask & REDRAW_ALL)
     DrawMaskedBorder_ALL();
   else
@@ -356,7 +351,6 @@ void DrawMaskedBorder(int redraw_mask)
 
 void BlitScreenToBitmap_RND(Bitmap *target_bitmap)
 {
-  DrawBuffer *buffer = (drawto_field == window ? backbuffer : drawto_field);
   int fx = FX, fy = FY;
   int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0);
   int full_lev_fieldy = lev_fieldy + (BorderElement != EL_EMPTY ? 2 : 0);
@@ -410,7 +404,7 @@ void BlitScreenToBitmap_RND(Bitmap *target_bitmap)
       fy = 2 * TILEY_VAR - (EVEN(lev_fieldy) ? TILEY_VAR / 2 : 0);
   }
 
-  BlitBitmap(buffer, target_bitmap, fx, fy, SXSIZE, SYSIZE, SX, SY);
+  BlitBitmap(drawto_field, target_bitmap, fx, fy, SXSIZE, SYSIZE, SX, SY);
 }
 
 void BlitScreenToBitmap(Bitmap *target_bitmap)
@@ -860,7 +854,9 @@ void ClearField()
     SetDrawtoField(DRAW_FIELDBUFFER);
   }
   else
+  {
     SetDrawtoField(DRAW_BACKBUFFER);
+  }
 }
 
 void MarkTileDirty(int x, int y)
@@ -2117,13 +2113,25 @@ void ShowEnvelope(int envelope_nr)
   BackToFront();
 }
 
-static void setRequestPosition(int *x, int *y, boolean add_border_size)
+static void setRequestCenterPosition(int *x, int *y)
 {
-  int border_size = request.border_size;
   int sx_center = (request.x != -1 ? request.x : SX + SXSIZE / 2);
   int sy_center = (request.y != -1 ? request.y : SY + SYSIZE / 2);
-  int sx = sx_center - request.width  / 2;
-  int sy = sy_center - request.height / 2;
+
+  *x = sx_center;
+  *y = sy_center;
+}
+
+static void setRequestPosition(int *x, int *y, boolean add_border_size)
+{
+  int border_size = request.border_size;
+  int sx_center, sy_center;
+  int sx, sy;
+
+  setRequestCenterPosition(&sx_center, &sy_center);
+
+  sx = sx_center - request.width  / 2;
+  sy = sy_center - request.height / 2;
 
   if (add_border_size)
   {
@@ -2262,18 +2270,22 @@ void AnimateEnvelopeRequest(int anim_mode, int action)
     int y = ystart + i * ystep;
     int xsize = (action == ACTION_CLOSING ? xend - (x - xstart) : x) + 2;
     int ysize = (action == ACTION_CLOSING ? yend - (y - ystart) : y) + 2;
-    int sx_center = (request.x != -1 ? request.x : SX + SXSIZE / 2);
-    int sy_center = (request.y != -1 ? request.y : SY + SYSIZE / 2);
-    int src_x = sx_center - width  / 2;
-    int src_y = sy_center - height / 2;
-    int dst_x = sx_center - xsize * tile_size / 2;
-    int dst_y = sy_center - ysize * tile_size / 2;
     int xsize_size_left = (xsize - 1) * tile_size;
     int ysize_size_top  = (ysize - 1) * tile_size;
     int max_xsize_pos = (max_xsize - 1) * tile_size;
     int max_ysize_pos = (max_ysize - 1) * tile_size;
+    int sx_center, sy_center;
+    int src_x, src_y;
+    int dst_x, dst_y;
     int xx, yy;
 
+    setRequestCenterPosition(&sx_center, &sy_center);
+
+    src_x = sx_center - width  / 2;
+    src_y = sy_center - height / 2;
+    dst_x = sx_center - xsize * tile_size / 2;
+    dst_y = sy_center - ysize * tile_size / 2;
+
     BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
     for (yy = 0; yy < 2; yy++)
@@ -2305,7 +2317,6 @@ void AnimateEnvelopeRequest(int anim_mode, int action)
   }
 }
 
-
 void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
 {
   int last_game_status = game_status;	/* save current game status */
@@ -3274,9 +3285,15 @@ void WaitForEventToContinue()
 
 static int RequestHandleEvents(unsigned int req_state)
 {
+  boolean level_solved = (game_status == GAME_MODE_PLAYING &&
+			  local_player->LevelSolved_GameEnd);
   int last_game_status = game_status;	/* save current game status */
+  int width  = request.width;
+  int height = request.height;
+  int sx, sy;
   int result;
-  int mx, my;
+
+  setRequestPosition(&sx, &sy, FALSE);
 
   button_status = MB_RELEASED;
 
@@ -3285,6 +3302,21 @@ static int RequestHandleEvents(unsigned int req_state)
 
   while (result < 0)
   {
+    if (level_solved)
+    {
+      SetDrawtoField(DRAW_FIELDBUFFER);
+
+      HandleGameActions();
+
+      SetDrawtoField(DRAW_BACKBUFFER);
+
+      if (global.use_envelope_request)
+      {
+	/* copy current state of request area to middle of playfield area */
+	BlitBitmap(bitmap_db_cross, drawto, sx, sy, width, height, sx, sy);
+      }
+    }
+
     if (PendingEvent())
     {
       Event event;
@@ -3297,6 +3329,8 @@ static int RequestHandleEvents(unsigned int req_state)
 	  case EVENT_BUTTONRELEASE:
 	  case EVENT_MOTIONNOTIFY:
 	  {
+	    int mx, my;
+
 	    if (event.type == EVENT_MOTIONNOTIFY)
 	    {
 	      if (!button_status)
@@ -3402,9 +3436,13 @@ static int RequestHandleEvents(unsigned int req_state)
 	result = 0;
     }
 
-    if (game_status == GAME_MODE_PLAYING && local_player->LevelSolved_GameEnd)
+    if (level_solved)
     {
-      HandleGameActions();
+      if (global.use_envelope_request)
+      {
+	/* copy back current state of pressed buttons inside request area */
+	BlitBitmap(drawto, bitmap_db_cross, sx, sy, width, height, sx, sy);
+      }
     }
     else
     {