fixed panel content of closing door 1 when leaving game to main menu

[rocksndiamonds.git] / src / editor.c

diff --git a/src/editor.c b/src/editor.c
index 6414dbd4b5619682cb9771fe62c231819d7d9597..c7e23051c642435bead4f946d350b136a3255f99 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -7612,8 +7612,6 @@ void InitZoomLevelSettings()
   MAX_ED_FIELDY = getMaxEdFieldY(FALSE);
 }
 
-static boolean playfield_area_changed = FALSE;
-
 void DrawLevelEd()
 {
   int fade_mask = REDRAW_FIELD;
@@ -7622,38 +7620,18 @@ void DrawLevelEd()
 
   CloseDoor(DOOR_CLOSE_ALL);
 
-#if 1
   /* needed if different viewport properties defined for editor */
   ChangeViewportPropertiesIfNeeded();
-#endif
 
-  if (CheckIfRedrawGlobalBorderIsNeeded())
+  if (CheckIfGlobalBorderHasChanged())
     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();
 
-  playfield_area_changed = DrawingAreaChanged();
-
   OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2 | DOOR_NO_DELAY);
 
 #if DEBUG
@@ -7712,11 +7690,6 @@ void DrawLevelEd()
 
   DrawEditModeWindow();
 
-  fade_mask = (playfield_area_changed ? REDRAW_ALL : REDRAW_FIELD);
-
-  if (CheckIfRedrawGlobalBorderIsNeeded())
-    fade_mask = REDRAW_ALL;
-
   FadeIn(fade_mask);
 
   /* copy actual editor door content to door double buffer for OpenDoor() */
@@ -12291,7 +12264,7 @@ void RequestExitLevelEditor(boolean ask_if_level_has_changed,
 
     game_status = GAME_MODE_MAIN;
 
-    DrawAndFadeInMainMenu(playfield_area_changed ? REDRAW_ALL : REDRAW_FIELD);
+    DrawMainMenu();
   }
   else
   {