fixed tile cursor drawing position

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 40ac8d37c5289442b6a76f12d963f279975be07b..ec647a63411c626022af38cbd83996b286125af7 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -646,9 +646,11 @@ void DrawMaskedBorderToTarget(int draw_target)
   }
 }
 
-void DrawTileCursor(int draw_target)
+void DrawTileCursor(int draw_target, int drawing_stage)
 {
-  DrawTileCursor_MM(draw_target, game_status == GAME_MODE_PLAYING);
+  int tile_cursor_active = (game_status == GAME_MODE_PLAYING);
+
+  DrawTileCursor_MM(draw_target, drawing_stage, tile_cursor_active);
 }
 
 void BlitScreenToBitmapExt_RND(Bitmap *target_bitmap, int fx, int fy)
@@ -4793,6 +4795,12 @@ static int RequestHandleEvents(unsigned int req_state, int draw_buffer_game)
 
 static void DoRequestBefore(void)
 {
+  boolean game_ended = (game_status == GAME_MODE_PLAYING && checkGameEnded());
+
+  // when showing request dialog after game ended, deactivate game panel
+  if (game_ended)
+    game.panel.active = FALSE;
+
   if (game_status == GAME_MODE_PLAYING)
     BlitScreenToBitmap(backbuffer);
 
@@ -4894,14 +4902,12 @@ static void DrawRequestDoorText(char *text)
   ResetFontStatus();
 }
 
-static boolean RequestDoor(char *text, unsigned int req_state)
+static int RequestDoor(char *text, unsigned int req_state)
 {
-  int draw_buffer_last = GetDrawtoField();
   unsigned int old_door_state = GetDoorState();
+  int draw_buffer_last = GetDrawtoField();
   int result;
 
-  DoRequestBefore();
-
   if (old_door_state & DOOR_OPEN_1)
   {
     CloseDoor(DOOR_CLOSE_1);
@@ -4941,18 +4947,14 @@ static boolean RequestDoor(char *text, unsigned int req_state)
       OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
   }
 
-  DoRequestAfter();
-
   return result;
 }
 
-static boolean RequestEnvelope(char *text, unsigned int req_state)
+static int RequestEnvelope(char *text, unsigned int req_state)
 {
   int draw_buffer_last = GetDrawtoField();
   int result;
 
-  DoRequestBefore();
-
   DrawEnvelopeRequest(text, req_state);
   ShowEnvelopeRequest(text, req_state, ACTION_OPENING);
 
@@ -4963,30 +4965,27 @@ static boolean RequestEnvelope(char *text, unsigned int req_state)
 
   ShowEnvelopeRequest(text, req_state, ACTION_CLOSING);
 
-  DoRequestAfter();
-
   return result;
 }
 
-boolean Request(char *text, unsigned int req_state)
+int Request(char *text, unsigned int req_state)
 {
-  boolean game_ended = (game_status == GAME_MODE_PLAYING && checkGameEnded());
   boolean overlay_enabled = GetOverlayEnabled();
-  boolean result;
-
-  // when showing request dialog after game ended, deactivate game panel
-  if (game_ended)
-    game.panel.active = FALSE;
+  int result;
 
   game.request_active = TRUE;
 
   SetOverlayEnabled(FALSE);
 
+  DoRequestBefore();
+
   if (global.use_envelope_request)
     result = RequestEnvelope(text, req_state);
   else
     result = RequestDoor(text, req_state);
 
+  DoRequestAfter();
+
   SetOverlayEnabled(overlay_enabled);
 
   game.request_active = FALSE;