rnd-20061013-1-src

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 6e7703279bdf7825001ed881ace4d8692600fa0f..94c63b8826d76d06b704da0c041cb5e3491089e1 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
+* (c) 1995-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -358,6 +358,7 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
       graphic_info[IMG_TITLESCREEN_1].bitmap != NULL)
   {
     game_status = GAME_MODE_TITLE;
+
     DrawTitleScreen();
 
     return;
@@ -431,6 +432,8 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   MapTapeButtons();
   MapScreenMenuGadgets(SCREEN_MASK_MAIN);
 
+  DrawMaskedBorder(REDRAW_ALL);
+
   if (do_fading)
     FadeIn(redraw_mask);
   else
@@ -848,6 +851,8 @@ static void DrawInfoScreen_Main(boolean do_fading)
   PlayMenuSound();
   PlayMenuMusic();
 
+  DrawMaskedBorder(REDRAW_ALL);
+
   if (do_fading)
     FadeIn(REDRAW_ALL);
   else
@@ -2555,7 +2560,7 @@ static struct TokenInfo setup_info_graphics[] =
   { TYPE_SWITCH,       &setup.soft_scrolling,  "Soft Scrolling:"       },
   { TYPE_SWITCH,       &setup.double_buffering,"Double-Buffering:"     },
 #endif
-  { TYPE_SWITCH,       &setup.fading,          "Fading:"               },
+  { TYPE_SWITCH,       &setup.fade_screens,    "Fade Screens:"         },
   { TYPE_SWITCH,       &setup.quick_switch,    "Quick Player Focus Switch:" },
   { TYPE_SWITCH,       &setup.quick_doors,     "Quick Menu Doors:"     },
   { TYPE_SWITCH,       &setup.show_titlescreen,"Show Title Screens:"   },