From: Holger Schemel <info@artsoft.org>
Date: Thu, 13 Aug 2015 13:14:45 +0000 (+0200)
Subject: fixed fading door areas when using different masked global borders
X-Git-Tag: 4.0.0.0-rc1~155
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=11bd782b9345d3bec0ed2f6b2ed1bb310f365c4f;p=rocksndiamonds.git

fixed fading door areas when using different masked global borders
---

diff --git a/src/game.c b/src/game.c
index cfeedb8f..028e9f4e 100644
--- a/src/game.c
+++ b/src/game.c
@@ -3112,6 +3112,8 @@ void InitGame()
 
   FadeOut(fade_mask);
 
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
   ClearField();
 
   DrawCompleteVideoDisplay();
diff --git a/src/screens.c b/src/screens.c
index 4f7d783a..8ec78ee6 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -2159,12 +2159,7 @@ static void DrawInfoScreen_Main()
 
   FadeOut(fade_mask);
 
-  if (fade_mask == REDRAW_ALL)
-  {
-    RedrawGlobalBorder();
-
-    OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
-  }
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
 
   ClearField();
 
@@ -3660,6 +3655,8 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
 
   FadeOut(fade_mask);
 
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
   ClearField();
 
   HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
@@ -4172,6 +4169,8 @@ void DrawHallOfFame(int highlight_position)
   PlayMenuSound();
   PlayMenuMusic();
 
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
   HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE);
 
   DrawMaskedBorder(fade_mask);
@@ -5773,6 +5772,8 @@ static void DrawSetupScreen_Generic()
 
   FadeOut(fade_mask);
 
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
   ClearField();
 
   if (setup_mode == SETUP_MODE_MAIN)