fixed fading complete screen if playfield viewport has changed

[rocksndiamonds.git] / src / editor.c

diff --git a/src/editor.c b/src/editor.c
index 9677a17cfc1e018891b785b05945d7cb31ca1988..5f9b2b9d9e0f95807b7e5b9142c67bd6104e2842 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -1297,7 +1297,6 @@ static struct ElementInfo custom_element;
 static char levelset_name[MAX_LEVEL_NAME_LEN + 1];
 static char levelset_author[MAX_LEVEL_AUTHOR_LEN + 1];
 static int levelset_num_levels = 100;
-static int levelset_first_level_nr = 1;
 static int levelset_save_mode = LEVELSET_SAVE_MODE_UPDATE;
 
 static struct
@@ -5689,6 +5688,10 @@ static void ReinitializeElementList()
 
     num_editor_elements += num_editor_el_empty;
   }
+  else
+  {
+    num_editor_el_empty = 0;
+  }
 
   editor_elements = checked_malloc(num_editor_elements * sizeof(int));
 
@@ -7591,7 +7594,7 @@ static void ModifyLevelInfoForSavingIntoPersonalLevelSet(char *former_name)
   }
 
   if (level_nr > leveldir_current->last_level)
-    UpdateUserLevelSet(getLoginName(), NULL, NULL, level_nr + 9, -1);
+    UpdateUserLevelSet(getLoginName(), NULL, NULL, level_nr + 9);
 
   // else: allow the save even if annotation failed
 
@@ -8230,8 +8233,7 @@ static void InitLevelSetInfo()
   snprintf(levelset_author, MAX_LEVEL_AUTHOR_LEN + 1,
           "%s", leveldir_current->author);
 
-  levelset_num_levels     = leveldir_current->levels;
-  levelset_first_level_nr = leveldir_current->first_level;
+  levelset_num_levels = leveldir_current->levels;
 
   levelset_save_mode = LEVELSET_SAVE_MODE_UPDATE;
 }
@@ -8262,7 +8264,7 @@ void DrawLevelEd()
 
   FadeSoundsAndMusic();
 
-  if (CheckIfGlobalBorderHasChanged())
+  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
     fade_mask = REDRAW_ALL;
 
   FadeOut(fade_mask);
@@ -8275,7 +8277,7 @@ void DrawLevelEd()
   InitZoomLevelSettings(-1);
   InitLevelSetInfo();
 
-  OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2 | DOOR_NO_DELAY);
+  SetDoorState(DOOR_OPEN_1 | DOOR_OPEN_2);
 
 #if DEBUG
   CheckElementDescriptions();
@@ -12640,8 +12642,7 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
       if (UpdateUserLevelSet(levelset_subdir,
                             levelset_name,
                             levelset_author,
-                            levelset_num_levels,
-                            levelset_first_level_nr))
+                            levelset_num_levels))
       {
        Request("Level set updated!", REQ_CONFIRM);
       }
@@ -12655,8 +12656,7 @@ static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
       if (CreateUserLevelSet(levelset_subdir,
                             levelset_name,
                             levelset_author,
-                            levelset_num_levels,
-                            1))
+                            levelset_num_levels))
       {
        Request("New level set created!", REQ_CONFIRM);