projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20140213-1-src
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index e2f3f27f1367ba986a40c7d490257091dd3b035b..43ad44de0a8a49dbb03193ef71ddd87f745becb5 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-1387,8
+1387,11
@@
void DrawMainMenuExt(int fade_mask, boolean do_fading)
#if 1
FadeOut(fade_mask);
#if 1
FadeOut(fade_mask);
+#if 0
/* needed if last screen was the editor screen */
UndrawSpecialEditorDoor();
/* needed if last screen was the editor screen */
UndrawSpecialEditorDoor();
+#endif
+
#if 0
if (fade_mask == REDRAW_FIELD)
BackToFront();
#if 0
if (fade_mask == REDRAW_FIELD)
BackToFront();
@@
-1400,6
+1403,11
@@
void DrawMainMenuExt(int fade_mask, boolean do_fading)
ChangeViewportPropertiesIfNeeded();
#endif
ChangeViewportPropertiesIfNeeded();
#endif
+#if 1
+ /* needed if last screen was the editor screen */
+ UndrawSpecialEditorDoor();
+#endif
+
#if defined(TARGET_SDL)
SetDrawtoField(DRAW_BACKBUFFER);
#endif
#if defined(TARGET_SDL)
SetDrawtoField(DRAW_BACKBUFFER);
#endif
@@
-1906,6
+1914,8
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
!strEqual(setup.player_name, "Artsoft"))
Request("This level is read only!", REQ_CONFIRM);
!strEqual(setup.player_name, "Artsoft"))
Request("This level is read only!", REQ_CONFIRM);
+ CloseDoor(DOOR_CLOSE_2);
+
game_status = GAME_MODE_EDITOR;
FadeSetEnterScreen();
game_status = GAME_MODE_EDITOR;
FadeSetEnterScreen();