static TreeInfo *level_number = NULL;
static TreeInfo *level_number_current = NULL;
+static unsigned int sync_frame_delay = 0;
+static unsigned int sync_frame_delay_value = GAME_FRAME_DELAY;
+
static struct
{
int value;
{
boolean is_image;
boolean initial;
+ boolean first;
int local_nr;
int sort_priority;
};
static struct TitleFadingInfo getTitleFading(struct TitleControlInfo *tci)
{
boolean is_image = tci->is_image;
- int initial = tci->initial;
+ boolean initial = tci->initial;
+ boolean first = tci->first;
int nr = tci->local_nr;
+ struct TitleMessageInfo tmi;
struct TitleFadingInfo ti;
- if (is_image)
- {
- int graphic = getTitleScreenGraphic(nr, initial);
-
- /* initialize fading control values to default title config settings */
- ti = (initial ? title_initial_default : title_default);
-
- /* override default settings with image config settings, if defined */
- if (graphic_info[graphic].fade_mode != FADE_MODE_DEFAULT)
- ti.fade_mode = graphic_info[graphic].fade_mode;
- if (graphic_info[graphic].fade_delay > -1)
- ti.fade_delay = graphic_info[graphic].fade_delay;
- if (graphic_info[graphic].post_delay > -1)
- ti.post_delay = graphic_info[graphic].post_delay;
- if (graphic_info[graphic].auto_delay > -1)
- ti.auto_delay = graphic_info[graphic].auto_delay;
- }
- else
- {
- if (initial)
- {
- ti.fade_mode = titlemessage_initial[nr].fade_mode;
- ti.fade_delay = titlemessage_initial[nr].fade_delay;
- ti.post_delay = titlemessage_initial[nr].post_delay;
- ti.auto_delay = titlemessage_initial[nr].auto_delay;
- }
- else
- {
- ti.fade_mode = titlemessage[nr].fade_mode;
- ti.fade_delay = titlemessage[nr].fade_delay;
- ti.post_delay = titlemessage[nr].post_delay;
- ti.auto_delay = titlemessage[nr].auto_delay;
- }
- }
+ tmi = (is_image ? (initial ? (first ?
+ titlescreen_initial_first[nr] :
+ titlescreen_initial[nr])
+ : (first ?
+ titlescreen_first[nr] :
+ titlescreen[nr]))
+ : (initial ? (first ?
+ titlemessage_initial_first[nr] :
+ titlemessage_initial[nr])
+ : (first ?
+ titlemessage_first[nr] :
+ titlemessage[nr])));
+
+ ti.fade_mode = tmi.fade_mode;
+ ti.fade_delay = tmi.fade_delay;
+ ti.post_delay = tmi.post_delay;
+ ti.auto_delay = tmi.auto_delay;
return ti;
}
title_controls[num_title_screens].local_nr = nr;
title_controls[num_title_screens].sort_priority = sort_priority;
+ title_controls[num_title_screens].first = FALSE; /* will be set later */
+
num_title_screens++;
}
/* sort title screens according to sort_priority and title number */
qsort(title_controls, num_title_screens, sizeof(struct TitleControlInfo),
compareTitleControlInfo);
+
+ /* mark first title screen */
+ title_controls[0].first = TRUE;
}
static boolean visibleMenuPos(struct MenuPosInfo *pos)
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);
/* force TITLE font on title message screen */
game_status = getTitleMessageGameMode(initial);
+ /* if chars *and* width set to "-1", automatically determine width */
+ if (tmi->chars == -1 && tmi->width == -1)
+ tmi->width = viewport.window[game_status].width;
+
+ /* if lines *and* height set to "-1", automatically determine height */
+ if (tmi->lines == -1 && tmi->height == -1)
+ tmi->height = viewport.window[game_status].height;
+
/* if chars set to "-1", automatically determine by text and font width */
if (tmi->chars == -1)
tmi->chars = tmi->width / getFontWidth(tmi->font);
else
tmi->height = tmi->lines * getFontHeight(tmi->font);
+ /* if x set to "-1", automatically determine by width and alignment */
+ if (tmi->x == -1)
+ tmi->x = -1 * ALIGNED_XPOS(0, tmi->width, tmi->align);
+
+ /* if y set to "-1", automatically determine by height and alignment */
+ if (tmi->y == -1)
+ tmi->y = -1 * ALIGNED_YPOS(0, tmi->height, tmi->valign);
+
SetDrawBackgroundMask(REDRAW_ALL);
SetWindowBackgroundImage(getTitleBackground(nr, initial, 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();
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();
static int last_sound = -1, last_music = -1;
boolean return_to_main_menu = FALSE;
struct TitleControlInfo *tci;
- struct TitleFadingInfo fading_default;
- struct TitleFadingInfo fading_last = fading;
- struct TitleFadingInfo fading_next;
int sound, music;
if (button == MB_MENU_INITIALIZE)
last_sound = SND_UNDEFINED;
last_music = MUS_UNDEFINED;
- if (game_status == GAME_MODE_INFO)
+ if (num_title_screens != 0)
+ {
+ FadeSetEnterScreen();
+
+ /* use individual title fading instead of global "enter screen" fading */
+ fading = getTitleFading(tci);
+ }
+
+ if (game_status_last_screen == GAME_MODE_INFO)
{
if (num_title_screens == 0)
{
+ /* switch game mode from title screen mode back to info screen mode */
+ game_status = GAME_MODE_INFO;
+
DrawInfoScreen_NotAvailable("Title screen information:",
"No title screen for this level set.");
FadeOut(REDRAW_ALL);
}
+ /* only required to update logic for redrawing global border */
+ ClearField();
+
+ /* title screens may have different window size */
+ ChangeViewportPropertiesIfNeeded();
+
if (tci->is_image)
DrawTitleScreenImage(tci->local_nr, tci->initial);
else
DrawTitleScreenMessage(tci->local_nr, tci->initial);
- fading_default = (tci->initial ? title_initial_default : title_default);
-
- fading = fading_next = getTitleFading(tci);
-
- if (!(fading_last.fade_mode & FADE_TYPE_TRANSFORM) &&
- fading_next.fade_mode & FADE_TYPE_TRANSFORM)
- {
- fading.fade_mode = FADE_MODE_FADE;
- fading.fade_delay = fading_default.fade_delay;
- }
-
sound = getTitleSound(tci);
music = getTitleMusic(tci);
FadeIn(REDRAW_ALL);
- fading = fading_next;
-
DelayReached(&title_delay, 0); /* reset delay counter */
return;
}
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;
+
DrawInfoScreen();
return;
if (music == MUS_UNDEFINED || music != last_music)
FadeMusic();
+ fading = getTitleFading(tci);
+
FadeOut(REDRAW_ALL);
if (tci->is_image)
else
DrawTitleScreenMessage(tci->local_nr, tci->initial);
- fading_next = getTitleFading(tci);
-
sound = getTitleSound(tci);
music = getTitleMusic(tci);
last_sound = sound;
last_music = music;
- /* last screen already faded out, next screen has no animation */
- if (!(fading.fade_mode & FADE_TYPE_TRANSFORM) &&
- fading_next.fade_mode == FADE_MODE_NONE)
- fading = fading_next;
-
FadeIn(REDRAW_ALL);
- fading = fading_next;
-
DelayReached(&title_delay, 0); /* reset delay counter */
}
else
/* force full menu screen redraw after displaying title screens */
redraw_mask = REDRAW_ALL;
- if (game_status == GAME_MODE_INFO)
+ if (game_status_last_screen == GAME_MODE_INFO)
{
+ game_status = GAME_MODE_INFO;
info_mode = INFO_MODE_MAIN;
DrawInfoScreen();
}
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)
{
+ StopAnimation();
+
+ CloseDoor(DOOR_CLOSE_2);
+
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;
if (redraw_mask & REDRAW_ALL)
fade_mask = REDRAW_ALL;
- if (CheckIfRedrawGlobalBorderIsNeeded())
+ 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();
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);
void DrawInfoScreen_TitleScreen()
{
+ game_status_last_screen = GAME_MODE_INFO;
+ game_status = GAME_MODE_TITLE;
+
DrawTitleScreen();
}
{
int fade_mask = REDRAW_FIELD;
- if (CheckIfRedrawGlobalBorderIsNeeded())
+ if (CheckIfGlobalBorderHasChanged())
fade_mask = REDRAW_ALL;
if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY))
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();
/* needed if different viewport properties defined for scores */
ChangeViewportPropertiesIfNeeded();
- if (CheckIfRedrawGlobalBorderIsNeeded())
+ if (CheckIfGlobalBorderHasChanged())
fade_mask = REDRAW_ALL;
UnmapAllGadgets();
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);
}
{ TYPE_SWITCH, &setup.quick_switch, "Quick Player Focus Switch:" },
{ TYPE_SWITCH, &setup.quick_doors, "Quick Menu Doors:" },
{ TYPE_SWITCH, &setup.show_titlescreen,"Show Title Screens:" },
- { TYPE_SWITCH, &setup.toons, "Show Toons:" },
+ { TYPE_SWITCH, &setup.toons, "Show Menu Animations:" },
{ TYPE_ECS_AGA, &setup.prefer_aga_graphics,"EMC graphics preference:" },
{ TYPE_SWITCH, &setup.sp_show_border_elements,"Supaplex Border Elements:" },
{ TYPE_SWITCH, &setup.small_game_graphics, "Small Game Graphics:" },
DoAnimation();
BackToFront();
- /* don't eat all CPU time */
- Delay(10);
+ WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
}
return key;
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();
DoAnimation();
BackToFront();
- /* don't eat all CPU time */
- Delay(10);
+ WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
}
/* write new key bindings back to player setup */
DoAnimation();
BackToFront();
- /* don't eat all CPU time */
- Delay(10);
+ WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
}
/* calibrated center position (joystick should now be centered) */
NextEvent(&event);
HandleOtherEvents(&event);
- Delay(10);
+ WaitUntilDelayReached(&sync_frame_delay, sync_frame_delay_value);
}
}