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 6ddc604442357d6b902c7b1349f6ea4dcef0af36..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
@@
-1755,7
+1763,7
@@
void HandleMainMenu_SelectLevel(int step, int direction)
{
/* skipping levels is only allowed when trying to skip single level */
if (setup.skip_levels && step == 1 &&
{
/* skipping levels is only allowed when trying to skip single level */
if (setup.skip_levels && step == 1 &&
- Request("Level still unsolved
! Skip despite handicap
?", REQ_ASK))
+ Request("Level still unsolved
! Skip despite handicap
?", REQ_ASK))
{
leveldir_current->handicap_level++;
SaveLevelSetup_SeriesInfo();
{
leveldir_current->handicap_level++;
SaveLevelSetup_SeriesInfo();
@@
-1904,7
+1912,9
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
{
if (leveldir_current->readonly &&
!strEqual(setup.player_name, "Artsoft"))
{
if (leveldir_current->readonly &&
!strEqual(setup.player_name, "Artsoft"))
- Request("This level is read only !", REQ_CONFIRM);
+ Request("This level is read only!", REQ_CONFIRM);
+
+ CloseDoor(DOOR_CLOSE_2);
game_status = GAME_MODE_EDITOR;
game_status = GAME_MODE_EDITOR;
@@
-1940,7
+1950,7
@@
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
SaveLevelSetup_LastSeries();
SaveLevelSetup_SeriesInfo();
SaveLevelSetup_LastSeries();
SaveLevelSetup_SeriesInfo();
- if (Request("Do you really want to quit
?", REQ_ASK | REQ_STAY_CLOSED))
+ if (Request("Do you really want to quit?", REQ_ASK | REQ_STAY_CLOSED))
game_status = GAME_MODE_QUIT;
}
}
game_status = GAME_MODE_QUIT;
}
}