rnd-20070425-1-src

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 4289203cf9269f05601b370fe7c659cf9d1ff33b..527fbd055ac26f701447e875973bb3fc041bd239 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -1316,7 +1316,8 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
 
   FadeSetLeaveScreen();
 
-#if 1
+  /* (does not work well when changing to editor, which fades out itself) */
+#if 0
   FadeOut(redraw_mask);
 #endif
 
@@ -1342,6 +1343,10 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
     return;
   }
 
+#if 1
+  FadeOut(redraw_mask);
+#endif
+
   /* needed if last screen was the editor screen */
   UndrawSpecialEditorDoor();
 
@@ -1529,7 +1534,9 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   MapTapeButtons();
   MapScreenMenuGadgets(SCREEN_MASK_MAIN);
 
+#if 1
   DrawMaskedBorder(REDRAW_ALL);
+#endif
 
 #if 1
   if (redraw_mask == REDRAW_ALL)
@@ -6065,21 +6072,6 @@ void HandleGameActions()
     AutoPlayTape();    /* continue automatically playing next tape */
 }
 
-#if 0
-void ChangeGameStatus(int new_game_status)
-{
-  /* for fading out last screen, use the last game status */
-  global.border_status = game_status;
-  global.fading_status = game_status;
-
-  /* ... */
-
-  /* for fading in next screen, use the new game status */
-  global.border_status = new_game_status;
-  global.fading_status = new_game_status;
-}
-#endif
-
 
 /* ---------- new screen button stuff -------------------------------------- */