static void DrawChooseLevelSet(void);
static void DrawChooseLevelNr(void);
static void DrawInfoScreen(void);
-static void DrawAndFadeInInfoScreen(int);
static void DrawSetupScreen(void);
-static void DrawInfoScreenExt(int, int);
static void DrawInfoScreen_NotAvailable(char *, char *);
static void DrawInfoScreen_HelpAnim(int, int, boolean);
static void DrawInfoScreen_HelpText(int, int, int, int);
setup.internal.program_copyright);
}
-int effectiveGameStatus()
-{
- if (game_status == GAME_MODE_INFO && info_mode == INFO_MODE_TITLE)
- return GAME_MODE_TITLE;
-
- return game_status;
-}
-
void DrawTitleScreenImage(int nr, boolean initial)
{
int graphic = getTitleScreenGraphic(nr, initial);
return (show_titlescreen && num_title_screens > 0);
}
-void DrawMainMenuExt(int fade_mask, boolean do_fading)
+void DrawMainMenu()
{
static LevelDirTree *leveldir_last_valid = NULL;
boolean levelset_has_changed = FALSE;
+ int fade_mask = REDRAW_FIELD;
LimitScreenUpdates(FALSE);
/* needed if last screen (level choice) changed graphics, sounds or music */
ReloadCustomArtwork(0);
-#if 1
/* needed if different viewport properties defined for menues */
ChangeViewportPropertiesIfNeeded();
-#endif
if (redraw_mask & REDRAW_ALL)
fade_mask = REDRAW_ALL;
- if (CheckIfRedrawGlobalBorderIsNeeded())
+ if (CheckIfGlobalBorderHasChanged())
fade_mask = REDRAW_ALL;
FadeOut(fade_mask);
-#if 0
- /* needed if different viewport properties defined for menues */
- ChangeViewportPropertiesIfNeeded();
-#endif
-
/* needed if last screen was the editor screen */
UndrawSpecialEditorDoor();
SetDrawtoField(DRAW_BACKBUFFER);
- /* reset drawing area change flag */
- DrawingAreaChanged();
-
if (CheckTitleScreen(levelset_has_changed))
{
+ game_status_last_screen = GAME_MODE_MAIN;
game_status = GAME_MODE_TITLE;
DrawTitleScreen();
SetMainBackgroundImage(IMG_BACKGROUND_MAIN);
-#if 1
+#if 0
if (fade_mask == REDRAW_ALL)
RedrawGlobalBorder();
#endif
MapScreenMenuGadgets(SCREEN_MASK_MAIN);
/* copy actual game door content to door double buffer for OpenDoor() */
+ BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
BlitBitmap(drawto, bitmap_db_door_2, VX, VY, VXSIZE, VYSIZE, 0, 0);
OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
- DrawMaskedBorder(REDRAW_ALL);
-
-#if 0
- if (redraw_mask & REDRAW_ALL)
- fade_mask = REDRAW_ALL;
-#endif
+ DrawMaskedBorder(fade_mask);
FadeIn(fade_mask);
FadeSetEnterMenu();
OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
}
-void DrawAndFadeInMainMenu(int fade_mask)
-{
- DrawMainMenuExt(fade_mask, TRUE);
-}
-
-void DrawMainMenu()
-{
- DrawMainMenuExt(REDRAW_ALL, FALSE);
-}
-
static void gotoTopLevelDir()
{
/* move upwards until inside (but not above) top level directory */
static int title_screen_nr = 0;
static int last_sound = -1, last_music = -1;
boolean return_to_main_menu = FALSE;
- boolean use_fading_main_menu = TRUE;
struct TitleControlInfo *tci;
struct TitleFadingInfo fading_default;
struct TitleFadingInfo fading_last = fading;
last_sound = SND_UNDEFINED;
last_music = MUS_UNDEFINED;
- if (game_status == GAME_MODE_INFO)
+ if (game_status_last_screen == GAME_MODE_INFO)
{
if (num_title_screens == 0)
{
FadeSoundsAndMusic();
FadeOut(REDRAW_ALL);
+
+ /* only required to update logic for redrawing global border */
+ ClearField();
}
+ ChangeViewportPropertiesIfNeeded();
+
if (tci->is_image)
DrawTitleScreenImage(tci->local_nr, tci->initial);
else
if (button == MB_MENU_LEAVE)
{
return_to_main_menu = TRUE;
- use_fading_main_menu = FALSE;
}
else if (button == MB_MENU_CHOICE)
{
- if (game_status == GAME_MODE_INFO && num_title_screens == 0)
+ if (game_status_last_screen == GAME_MODE_INFO && num_title_screens == 0)
{
FadeSetEnterScreen();
+ game_status = GAME_MODE_INFO;
info_mode = INFO_MODE_MAIN;
- DrawAndFadeInInfoScreen(REDRAW_FIELD);
+
+ DrawInfoScreen();
return;
}
{
SetMouseCursor(CURSOR_DEFAULT);
- if (game_status == GAME_MODE_INFO)
- {
- int fade_mask = (num_title_screens == 0 ? REDRAW_FIELD : REDRAW_ALL);
+ /* force full menu screen redraw after displaying title screens */
+ redraw_mask = REDRAW_ALL;
+ if (game_status_last_screen == GAME_MODE_INFO)
+ {
+ game_status = GAME_MODE_INFO;
info_mode = INFO_MODE_MAIN;
- DrawInfoScreenExt(fade_mask, use_fading_main_menu);
+ DrawInfoScreen();
}
else /* default: return to main menu */
{
game_status = GAME_MODE_MAIN;
- DrawMainMenuExt(REDRAW_ALL, use_fading_main_menu);
+ DrawMainMenu();
}
}
}
}
else if (pos == MAIN_CONTROL_LEVEL_NUMBER && !button)
{
+ StopAnimation();
+
+ CloseDoor(DOOR_CLOSE_2);
+
game_status = GAME_MODE_LEVELNR;
ChangeViewportPropertiesIfNeeded();
{
if (leveldir_first)
{
+ StopAnimation();
+
+ CloseDoor(DOOR_CLOSE_2);
+
game_status = GAME_MODE_LEVELS;
SaveLevelSetup_LastSeries();
}
else if (pos == MAIN_CONTROL_SCORES)
{
- game_status = GAME_MODE_SCORES;
+ StopAnimation();
-#if 1
- /* required before door position may be changed in next step */
- CloseDoor(DOOR_CLOSE_ALL);
-#endif
+ CloseDoor(DOOR_CLOSE_2);
- ChangeViewportPropertiesIfNeeded();
+ game_status = GAME_MODE_SCORES;
DrawHallOfFame(-1);
}
!strEqual(setup.player_name, "Artsoft"))
Request("This level is read only!", REQ_CONFIRM);
+ StopAnimation();
+
CloseDoor(DOOR_CLOSE_2);
game_status = GAME_MODE_EDITOR;
}
else if (pos == MAIN_CONTROL_INFO)
{
+ StopAnimation();
+
+ CloseDoor(DOOR_CLOSE_2);
+
game_status = GAME_MODE_INFO;
info_mode = INFO_MODE_MAIN;
}
else if (pos == MAIN_CONTROL_GAME)
{
+ StopAnimation();
+
StartGameActions(options.network, setup.autorecord, level.random_seed);
}
else if (pos == MAIN_CONTROL_SETUP)
{
+ StopAnimation();
+
+ CloseDoor(DOOR_CLOSE_2);
+
game_status = GAME_MODE_SETUP;
setup_mode = SETUP_MODE_MAIN;
{
game_status = GAME_MODE_MAIN;
- DrawMainMenuExt(REDRAW_FIELD, FALSE);
+ DrawMainMenu();
}
static struct TokenInfo info_info_main[] =
}
}
-static void DrawInfoScreen_Main(int fade_mask, boolean do_fading)
+static void DrawInfoScreen_Main()
{
+ int fade_mask = REDRAW_FIELD;
int i;
- if (CheckIfRedrawGlobalBorderIsNeeded())
+ if (redraw_mask & REDRAW_ALL)
+ fade_mask = REDRAW_ALL;
+
+ if (CheckIfGlobalBorderHasChanged())
fade_mask = REDRAW_ALL;
UnmapAllGadgets();
FadeOut(fade_mask);
- if (fade_mask == REDRAW_ALL)
- {
- RedrawGlobalBorder();
+ ChangeViewportPropertiesIfNeeded();
- OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
- }
+ OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
ClearField();
void DrawInfoScreen_TitleScreen()
{
+ game_status_last_screen = GAME_MODE_INFO;
+ game_status = GAME_MODE_TITLE;
+
DrawTitleScreen();
}
FadeSoundsAndMusic();
info_mode = INFO_MODE_MAIN;
- DrawAndFadeInInfoScreen(REDRAW_FIELD);
+ DrawInfoScreen();
return;
}
FadeSoundsAndMusic();
info_mode = INFO_MODE_MAIN;
- DrawAndFadeInInfoScreen(REDRAW_FIELD);
+ DrawInfoScreen();
return;
}
FadeSoundsAndMusic();
info_mode = INFO_MODE_MAIN;
- DrawAndFadeInInfoScreen(REDRAW_FIELD);
+ DrawInfoScreen();
return;
}
FadeSoundsAndMusic();
info_mode = INFO_MODE_MAIN;
- DrawAndFadeInInfoScreen(REDRAW_FIELD);
+ DrawInfoScreen();
}
else
{
FadeSoundsAndMusic();
info_mode = INFO_MODE_MAIN;
- DrawAndFadeInInfoScreen(REDRAW_FIELD);
+ DrawInfoScreen();
}
else
{
FadeSoundsAndMusic();
info_mode = INFO_MODE_MAIN;
- DrawAndFadeInInfoScreen(REDRAW_FIELD);
+ DrawInfoScreen();
}
else
{
}
}
-static void DrawInfoScreenExt(int fade_mask, boolean do_fading)
+static void DrawInfoScreen()
{
SetMainBackgroundImage(IMG_BACKGROUND_INFO);
else if (info_mode == INFO_MODE_LEVELSET)
DrawInfoScreen_LevelSet();
else
- DrawInfoScreen_Main(fade_mask, do_fading);
+ DrawInfoScreen_Main();
if (info_mode != INFO_MODE_MAIN &&
info_mode != INFO_MODE_TITLE &&
}
}
-void DrawAndFadeInInfoScreen(int fade_mask)
-{
- DrawInfoScreenExt(fade_mask, TRUE);
-}
-
-void DrawInfoScreen()
-{
- DrawInfoScreenExt(REDRAW_FIELD, FALSE);
-}
-
void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
{
if (info_mode == INFO_MODE_TITLE)
static void DrawChooseTree(TreeInfo **ti_ptr)
{
- int fade_mask = (DrawingAreaChanged() ? REDRAW_ALL : REDRAW_FIELD);
+ int fade_mask = REDRAW_FIELD;
+
+ if (CheckIfGlobalBorderHasChanged())
+ fade_mask = REDRAW_ALL;
if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY))
{
game_status = GAME_MODE_MAIN;
- DrawMainMenuExt(REDRAW_FIELD, FALSE);
+ DrawMainMenu();
return;
}
FadeOut(fade_mask);
+ OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
ClearField();
HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
MapScreenTreeGadgets(*ti_ptr);
+ DrawMaskedBorder(fade_mask);
+
FadeIn(fade_mask);
InitAnimation();
game_status = GAME_MODE_MAIN;
- DrawMainMenuExt(REDRAW_FIELD, FALSE);
+ DrawMainMenu();
}
return;
void DrawHallOfFame(int highlight_position)
{
- int fade_mask = (DrawingAreaChanged() ? REDRAW_ALL : 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();
+
+ if (CheckIfGlobalBorderHasChanged())
+ fade_mask = REDRAW_ALL;
UnmapAllGadgets();
FadeSoundsAndMusic();
SetDrawDeactivationMask(REDRAW_NONE);
SetDrawBackgroundMask(REDRAW_FIELD);
- CloseDoor(DOOR_CLOSE_ALL);
-
if (highlight_position < 0)
LoadScore(level_nr);
PlayMenuSound();
PlayMenuMusic();
+ OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE);
+ DrawMaskedBorder(fade_mask);
+
FadeIn(fade_mask);
}
game_status = GAME_MODE_MAIN;
- DrawAndFadeInMainMenu(REDRAW_FIELD);
+ DrawMainMenu();
}
if (game_status == GAME_MODE_SCORES)
{
game_status = GAME_MODE_MAIN;
- DrawMainMenuExt(REDRAW_FIELD, FALSE);
+ DrawMainMenu();
}
static void execSaveAndExitSetup()
static void DrawSetupScreen_Generic()
{
- int fade_mask = (DrawingAreaChanged() ? REDRAW_ALL : REDRAW_FIELD);
+ int fade_mask = REDRAW_FIELD;
boolean redraw_all = FALSE;
char *title_string = NULL;
int i;
- if (CheckIfRedrawGlobalBorderIsNeeded())
+ if (CheckIfGlobalBorderHasChanged())
fade_mask = REDRAW_ALL;
UnmapAllGadgets();
FadeOut(fade_mask);
+ OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
ClearField();
if (setup_mode == SETUP_MODE_MAIN)
if (redraw_all)
redraw_mask = fade_mask = REDRAW_ALL;
+ DrawMaskedBorder(fade_mask);
+
FadeIn(fade_mask);
InitAnimation();
projects / rocksndiamonds.git / blobdiff