projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed closing doors before fading screens when leaving level editor
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 7181f75029922116de9eb5cfa60d19b3f8b0404c..1f5d4230dfd5c489e73647ebc709f4f4f6628599 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-1394,6
+1394,8
@@
void DrawMainMenu()
/* needed if last screen was the playing screen, invoked from level editor */
if (level_editor_test_game)
{
/* needed if last screen was the playing screen, invoked from level editor */
if (level_editor_test_game)
{
+ CloseDoor(DOOR_CLOSE_ALL);
+
SetGameStatus(GAME_MODE_EDITOR);
DrawLevelEd();
SetGameStatus(GAME_MODE_EDITOR);
DrawLevelEd();
@@
-1442,9
+1444,6
@@
void DrawMainMenu()
FadeOut(fade_mask);
FadeOut(fade_mask);
- /* needed if last screen was the editor screen */
- UndrawSpecialEditorDoor();
-
SetDrawtoField(DRAW_BACKBUFFER);
/* level_nr may have been set to value over handicap with level editor */
SetDrawtoField(DRAW_BACKBUFFER);
/* level_nr may have been set to value over handicap with level editor */
@@
-2155,8
+2154,6
@@
static void DrawInfoScreen_Main()
FreeScreenGadgets();
CreateScreenGadgets();
FreeScreenGadgets();
CreateScreenGadgets();
- CloseDoor(DOOR_CLOSE_2);
-
/* (needed after displaying title screens which disable auto repeat) */
KeyboardAutoRepeatOn();
/* (needed after displaying title screens which disable auto repeat) */
KeyboardAutoRepeatOn();
@@
-2166,10
+2163,10
@@
static void DrawInfoScreen_Main()
ChangeViewportPropertiesIfNeeded();
ChangeViewportPropertiesIfNeeded();
- OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
-
ClearField();
ClearField();
+ OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Info Screen");
info_info = info_info_main;
DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Info Screen");
info_info = info_info_main;
@@
-2191,11
+2188,6
@@
static void DrawInfoScreen_Main()
PlayMenuSound();
PlayMenuMusic();
PlayMenuSound();
PlayMenuMusic();
-#if 1
- // needed after returning from title screens with different window size
- OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
-#endif
-
DrawMaskedBorder(fade_mask);
FadeIn(fade_mask);
DrawMaskedBorder(fade_mask);
FadeIn(fade_mask);
@@
-3667,14
+3659,12
@@
static void DrawChooseTree(TreeInfo **ti_ptr)
FreeScreenGadgets();
CreateScreenGadgets();
FreeScreenGadgets();
CreateScreenGadgets();
- CloseDoor(DOOR_CLOSE_2);
-
FadeOut(fade_mask);
FadeOut(fade_mask);
- OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
-
ClearField();
ClearField();
+ OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
MapScreenTreeGadgets(*ti_ptr);
HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
MapScreenTreeGadgets(*ti_ptr);
@@
-4153,9
+4143,6
@@
void DrawHallOfFame(int highlight_position)
{
int fade_mask = REDRAW_FIELD;
{
int fade_mask = REDRAW_FIELD;
- /* required before door position may be changed in next step */
- CloseDoor(DOOR_CLOSE_ALL);
-
/* needed if different viewport properties defined for scores */
ChangeViewportPropertiesIfNeeded();
/* needed if different viewport properties defined for scores */
ChangeViewportPropertiesIfNeeded();
@@
-5780,17
+5767,15
@@
static void DrawSetupScreen_Generic()
FreeScreenGadgets();
CreateScreenGadgets();
FreeScreenGadgets();
CreateScreenGadgets();
- CloseDoor(DOOR_CLOSE_2);
-
if (redraw_mask & REDRAW_ALL)
redraw_all = TRUE;
FadeOut(fade_mask);
if (redraw_mask & REDRAW_ALL)
redraw_all = TRUE;
FadeOut(fade_mask);
- OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
-
ClearField();
ClearField();
+ OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
if (setup_mode == SETUP_MODE_MAIN)
{
setup_info = setup_info_main;
if (setup_mode == SETUP_MODE_MAIN)
{
setup_info = setup_info_main;