rnd-20070420-1-src

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index f11bf658cdb53c96def4fb860edf2d42ea3e9de2..a94e34611f8d8337e55f9f4144ed9341619f56ff 100644 (file)
--- 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 47937e01f219e8c35a4b4637ca1599c34bcc72c3..5766be74e8c2884765e9853bc926cb20a4b2beff 100644 (file)
--- 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 d28cca62d3a119cf047bd7dec6fdbfd4b988e155..2bd6083e8c8f96fdcfffcb6049cdcc535d8b4108 100644 (file)
--- 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 a71ee30cb2069a3175bd88f60d600cd550b884b2..4d9c5462c2a66c679def5efb90072b811d865e1f 100644 (file)
--- 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 23d1b49e680f576fb2c5cd8dcc593ba769be0e46..61932a5db15c4d2d275fe60f185f36ab0ea76811 100644 (file)
--- 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 2ae872b475000ea3d2f0bddca41248f332f09f1c..ad36f123d2ffb3c90e0a159a35c483d6eb6c9f08 100644 (file)
--- 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)