From: Holger Schemel <info@artsoft.org>
Date: Thu, 19 Apr 2007 22:10:27 +0000 (+0200)
Subject: rnd-20070420-1-src
X-Git-Tag: 3.2.4^2~30
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=23ac9d644d93650ac7b88a50f44e9f1b5cdffa60;p=rocksndiamonds.git

rnd-20070420-1-src
---

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index f11bf658..a94e3461 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -5273,6 +5273,8 @@ struct ConfigInfo image_config[] =
   { "border.draw_masked.PLAYING",		"false"			},
   { "border.draw_masked.DOOR",			"false"			},
 
+  { "border.draw_masked_when_fading",		"true"			},
+
   { "menu.enter_menu.fade_mode",		"none"			},
   { "menu.enter_menu.fade_delay",		"250"			},
   { "menu.enter_menu.post_delay",		"125"			},
diff --git a/src/conf_var.c b/src/conf_var.c
index 47937e01..5766be74 100644
--- a/src/conf_var.c
+++ b/src/conf_var.c
@@ -960,6 +960,10 @@ struct TokenIntPtrInfo image_config_vars[] =
     "border.draw_masked.DOOR",
     &border.draw_masked[GFX_SPECIAL_ARG_DOOR]
   },
+  {
+    "border.draw_masked_when_fading",
+    &border.draw_masked_when_fading
+  },
   {
     "menu.enter_menu.fade_mode",
     &menu.enter_menu.fade_mode
diff --git a/src/conftime.h b/src/conftime.h
index d28cca62..2bd6083e 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2007-04-18 19:50"
+#define COMPILE_DATE_STRING "2007-04-20 00:04"
diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index a71ee30c..4d9c5462 100644
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -600,7 +600,12 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height,
       }
 
       if (steps_done >= steps_final)
+      {
+	if (draw_border_function != NULL)
+	  draw_border_function();
+
 	SDL_UpdateRect(surface_screen, dst_x, dst_y, width, height);
+      }
     }
   }
   else
diff --git a/src/main.h b/src/main.h
index 23d1b49e..61932a5d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -2039,6 +2039,7 @@
 struct BorderInfo
 {
   boolean draw_masked[NUM_SPECIAL_GFX_ARGS];
+  boolean draw_masked_when_fading;
 };
 
 struct MenuMainButtonInfo
diff --git a/src/tools.c b/src/tools.c
index 2ae872b4..ad36f123 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -585,7 +585,10 @@ void FadeExt(int fade_mask, int fade_mode)
     fade_delay = fading.fade_delay;
     post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0);
 
-    draw_border_function = DrawMaskedBorder_FIELD;
+    if (border.draw_masked_when_fading)
+      draw_border_function = DrawMaskedBorder_FIELD;	/* update when fading */
+    else
+      DrawMaskedBorder_FIELD();				/* draw once */
   }
   else		/* REDRAW_ALL */
   {
@@ -620,7 +623,9 @@ void FadeExt(int fade_mask, int fade_mode)
 
 void FadeIn(int fade_mask)
 {
+#if 0
   global.border_status = game_status;
+#endif
 
 #if 0
   global.fading_status = game_status;
@@ -700,6 +705,10 @@ void FadeOut(int fade_mask)
   FadeExt(fade_mask, FADE_MODE_FADE_OUT);
 #endif
 #endif
+
+#if 1
+  global.border_status = game_status;
+#endif
 }
 
 void FadeCross(int fade_mask)