removed duplicate variable to check if request dialog is active

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index accded22545e5bb8e1eba390403e551a2c87b4c4..f7fc34a2cd06ecfd80caa488e711d7d96ce92cbc 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -3063,7 +3063,7 @@ static void PrepareEnvelopeRequestToScreen(Bitmap *bitmap, int sx, int sy,
 void DrawEnvelopeRequestToScreen(int drawing_target)
 {
   if (global.use_envelope_request &&
-      game.request_active_or_moving &&
+      game.request_active &&
       drawing_target == DRAW_TO_SCREEN)
   {
     if (graphic_info[IMG_BACKGROUND_REQUEST].draw_masked)
@@ -3203,8 +3203,8 @@ static void DrawEnvelopeRequest(char *text, unsigned int req_state)
 
   setRequestPosition(&sx, &sy, FALSE);
 
-  // draw envelope request to temporary bitmap
-  drawto = bitmap_db_store_2;
+  // draw complete envelope request to temporary bitmap
+  drawto = bitmap_db_store_1;
 
   ClearRectangle(drawto, sx, sy, width, height);
 
@@ -3246,7 +3246,8 @@ static void DrawEnvelopeRequest(char *text, unsigned int req_state)
   // restore pointer to drawing buffer
   drawto = drawto_last;
 
-  PrepareEnvelopeRequestToScreen(bitmap_db_store_2, sx, sy, width, height);
+  // prepare complete envelope request from temporary bitmap
+  PrepareEnvelopeRequestToScreen(bitmap_db_store_1, sx, sy, width, height);
 
   if (text_door_style)
     free(text_door_style);
@@ -3316,12 +3317,14 @@ static void AnimateEnvelopeRequest(int anim_mode, int action)
        int xx_size = (xx ? tile_size : xsize_size_left);
        int yy_size = (yy ? tile_size : ysize_size_top);
 
-       BlitBitmap(bitmap_db_store_2, bitmap_db_store_1,
+       // draw partial (animated) envelope request to temporary bitmap
+       BlitBitmap(bitmap_db_store_1, bitmap_db_store_2,
                   src_xx, src_yy, xx_size, yy_size, dst_xx, dst_yy);
       }
     }
 
-    PrepareEnvelopeRequestToScreen(bitmap_db_store_1, dst_x, dst_y,
+    // prepare partial (animated) envelope request from temporary bitmap
+    PrepareEnvelopeRequestToScreen(bitmap_db_store_2, dst_x, dst_y,
                                   width, height);
 
     redraw_mask |= REDRAW_FIELD;
@@ -4505,8 +4508,6 @@ static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)
   if (game_just_ended)
     game.panel.active = FALSE;
 
-  game.request_active = TRUE;
-
   setRequestPosition(&sx, &sy, FALSE);
 
   button_status = MB_RELEASED;
@@ -4563,7 +4564,7 @@ static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)
            if (global.use_envelope_request)
            {
              // draw changed button states to temporary bitmap
-             drawto = bitmap_db_store_2;
+             drawto = bitmap_db_store_1;
            }
 
            // this sets 'request_gadget_id'
@@ -4571,10 +4572,12 @@ static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)
 
            if (global.use_envelope_request)
            {
-             PrepareEnvelopeRequestToScreen(drawto, sx, sy, width, height);
-
              // restore pointer to drawing buffer
              drawto = drawto_last;
+
+             // prepare complete envelope request from temporary bitmap
+             PrepareEnvelopeRequestToScreen(bitmap_db_store_1, sx, sy,
+                                            width, height);
            }
 
            switch (request_gadget_id)
@@ -4805,8 +4808,6 @@ static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)
 
   SetDrawtoField(draw_buffer_last);
 
-  game.request_active = FALSE;
-
   return result;
 }
 
@@ -5084,7 +5085,7 @@ boolean Request(char *text, unsigned int req_state)
   boolean overlay_enabled = GetOverlayEnabled();
   boolean result;
 
-  game.request_active_or_moving = TRUE;
+  game.request_active = TRUE;
 
   SetOverlayEnabled(FALSE);
 
@@ -5095,7 +5096,7 @@ boolean Request(char *text, unsigned int req_state)
 
   SetOverlayEnabled(overlay_enabled);
 
-  game.request_active_or_moving = FALSE;
+  game.request_active = FALSE;
 
   return result;
 }