added support for drawing request dialog on top of global animations

diff --git a/src/anim.c b/src/anim.c
index f109b874f39b75b0109e8d18af437e2f995a6e86..2e6280ce3d1f3cb629f8ddceb6f065da58bab9cc 100644 (file)
--- a/src/anim.c
+++ b/src/anim.c
@@ -870,6 +870,8 @@ void DrawGlobalAnimations(int drawing_target, int drawing_stage)
     ResetGlobalAnim_Clicked();
   }
 
+  DrawEnvelopeRequestToScreen(drawing_target, drawing_stage);
+
   if (gfx.cursor_mode_override != last_cursor_mode_override)
     SetMouseCursor(gfx.cursor_mode);
 }

diff --git a/src/tools.c b/src/tools.c
index 92d0fa3f1be1351d0f7ad66af4bd68752509cafc..4b6efe6fb3dcc93a9b38416ab8030f57b1aeb031 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -2844,6 +2844,19 @@ static void PrepareEnvelopeRequestToScreen(Bitmap *bitmap, int sx, int sy,
   request.ysize = ysize;
 }
 
+void DrawEnvelopeRequestToScreen(int drawing_target, int drawing_stage)
+{
+  if (global.use_envelope_request &&
+      game.request_active_or_moving &&
+      request.sort_priority > 0 &&
+      drawing_target == DRAW_TO_SCREEN &&
+      drawing_stage == DRAW_GLOBAL_ANIM_STAGE_2)
+  {
+    BlitToScreen(request.bitmap, 0, 0, request.xsize, request.ysize,
+                request.sx, request.sy);
+  }
+}
+
 static void setRequestBasePosition(int *x, int *y)
 {
   int sx_base, sy_base;

diff --git a/src/tools.h b/src/tools.h
index de7bb467b567934821e134e1f25b8f45d0ecca38..6d0126672f615fef4560b09c90f4dd344845adaa 100644 (file)
--- a/src/tools.h
+++ b/src/tools.h
@@ -191,7 +191,8 @@ void DrawMiniElement(int, int, int);
 void DrawMiniElementOrWall(int, int, int, int);
 
 void ShowEnvelope(int);
-void ShowEnvelopeDoor(char *text, int);
+void ShowEnvelopeDoor(char *, int);
+void DrawEnvelopeRequestToScreen(int, int);
 
 void DrawLevel(int);
 void DrawSizedLevel(int, int, int, int, int);