small cleanup of screen fading code

diff --git a/src/editor.c b/src/editor.c
index 9f8182d6702911351761230e8e86c9580140e5b3..257325a34b837dbccc03509a81eb5875f6ebec00 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -7620,33 +7620,15 @@ void DrawLevelEd()
 
   CloseDoor(DOOR_CLOSE_ALL);
 
-#if 1
   /* needed if different viewport properties defined for editor */
   ChangeViewportPropertiesIfNeeded();
-#endif
 
   if (CheckIfRedrawGlobalBorderIsNeeded())
     fade_mask = REDRAW_ALL;
 
-#if 0
-  printf("::: %d\n", (fade_mask == REDRAW_ALL ? 1 : 0));
-#endif
-
   FadeOut(fade_mask);
 
-#if 0
-  /* needed after playing if editor playfield area has different size */
-  ClearRectangle(drawto, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
-#endif
-
-#if 0
-  /* needed if different viewport properties defined for editor */
-  ChangeViewportPropertiesIfNeeded();
-#endif
-
-#if 1
   ClearField();
-#endif
 
   InitZoomLevelSettings();
 

diff --git a/src/game.c b/src/game.c
index 73505d24269569b52cb9927acfbd9a36a62f18a1..ae9346768b163531732e0fe2b5feca802ba7d630 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -3098,10 +3098,8 @@ void InitGame()
   if (!game.restart_level)
     CloseDoor(DOOR_CLOSE_1);
 
-#if 1
   /* needed if different viewport properties defined for playing */
   ChangeViewportPropertiesIfNeeded();
-#endif
 
   if (level_editor_test_game)
     FadeSkipNextFadeIn();
@@ -3111,20 +3109,9 @@ void InitGame()
   if (CheckIfRedrawGlobalBorderIsNeeded())
     fade_mask = REDRAW_ALL;
 
-#if 0
-  printf("::: %d\n", (fade_mask == REDRAW_ALL ? 1 : 0));
-#endif
-
   FadeOut(fade_mask);
 
-#if 0
-  /* needed if different viewport properties defined for playing */
-  ChangeViewportPropertiesIfNeeded();
-#endif
-
-#if 1
   ClearField();
-#endif
 
   DrawCompleteVideoDisplay();
 

diff --git a/src/screens.c b/src/screens.c
index 83e508ea3af63c962b4004828b9ae75add0f0d1d..aa8813c74d0655be21ae3d5b5b857147c4b47dd5 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -1416,10 +1416,8 @@ void DrawMainMenu()
   /* needed if last screen (level choice) changed graphics, sounds or music */
   ReloadCustomArtwork(0);
 
-#if 1
   /* needed if different viewport properties defined for menues */
   ChangeViewportPropertiesIfNeeded();
-#endif
 
   if (redraw_mask & REDRAW_ALL)
     fade_mask = REDRAW_ALL;
@@ -1429,11 +1427,6 @@ void DrawMainMenu()
 
   FadeOut(fade_mask);
 
-#if 0
-  /* needed if different viewport properties defined for menues */
-  ChangeViewportPropertiesIfNeeded();
-#endif
-
   /* needed if last screen was the editor screen */
   UndrawSpecialEditorDoor();
 
@@ -1461,7 +1454,7 @@ void DrawMainMenu()
 
   SetMainBackgroundImage(IMG_BACKGROUND_MAIN);
 
-#if 1
+#if 0
   if (fade_mask == REDRAW_ALL)
     RedrawGlobalBorder();
 #endif
@@ -1498,11 +1491,6 @@ void DrawMainMenu()
 
   DrawMaskedBorder(REDRAW_ALL);
 
-#if 0
-  if (redraw_mask & REDRAW_ALL)
-    fade_mask = REDRAW_ALL;
-#endif
-
   FadeIn(fade_mask);
   FadeSetEnterMenu();