{
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)
/* 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));
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 (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)
FadeSoundsAndMusic();
FadeOut(REDRAW_ALL);
-
- /* only required to update logic for redrawing global border */
- ClearField();
}
+ /* only required to update logic for redrawing global border */
+ ClearField();
+
+ /* title screens may have different window size */
ChangeViewportPropertiesIfNeeded();
if (tci->is_image)
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;
{
if (game_status_last_screen == GAME_MODE_INFO && num_title_screens == 0)
{
- FadeSetEnterScreen();
-
game_status = GAME_MODE_INFO;
info_mode = INFO_MODE_MAIN;
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
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);
projects / rocksndiamonds.git / blobdiff