X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=dc7fdc82ce8e760028335d404cbe00f4b5ac3987;hb=e2af6910a4e0e3312ccca5737d198e6921db6344;hp=9f8182d6702911351761230e8e86c9580140e5b3;hpb=f89a490028c36509216b97a96b779b779c2065c9;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index 9f8182d6..dc7fdc82 100644 --- a/src/editor.c +++ b/src/editor.c @@ -7616,37 +7616,17 @@ void DrawLevelEd() { int fade_mask = REDRAW_FIELD; - StopAnimation(); - 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(); @@ -7708,6 +7688,8 @@ void DrawLevelEd() DrawEditModeWindow(); + DrawMaskedBorder(fade_mask); + FadeIn(fade_mask); /* copy actual editor door content to door double buffer for OpenDoor() */ @@ -10939,7 +10921,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi) DrawFixedGraphicExt(drawto, gi->x + sx * TILEX, gi->y + sy * TILEY, - el2img(new_element), 0); + el2edimg(new_element), 0); if (id == GADGET_ID_CUSTOM_GRAPHIC) new_element = GFX_ELEMENT(new_element);