X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=a9448442cefcc3ffb3e47c695885da6624a46849;hp=264617545eca10292faeeebe26e54864e5dcefcb;hb=61f3e4384807556f36acba1388e4b5535c583c13;hpb=c3fa9fcf03db2a48bbd8fa343b79a94c42d4cac3

diff --git a/src/screens.c b/src/screens.c
index 26461754..a9448442 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -455,6 +455,7 @@ struct TitleControlInfo
 {
   boolean is_image;
   boolean initial;
+  boolean first;
   int local_nr;
   int sort_priority;
 };
@@ -803,44 +804,29 @@ static int getTitleMusic(struct TitleControlInfo *tci)
 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;
 }
@@ -872,6 +858,8 @@ static void InitializeTitleControlsExt_AddTitleInfo(boolean is_image,
   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++;
 }
 
@@ -914,6 +902,9 @@ static void InitializeTitleControls(boolean show_title_initial)
   /* 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)
@@ -1252,14 +1243,6 @@ void DrawHeadline()
 		    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);
@@ -1316,6 +1299,14 @@ void DrawTitleScreenMessage(int nr, boolean 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);
@@ -1328,6 +1319,14 @@ void DrawTitleScreenMessage(int nr, boolean initial)
   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));
 
@@ -1434,6 +1433,7 @@ void DrawMainMenu()
 
   if (CheckTitleScreen(levelset_has_changed))
   {
+    game_status_last_screen = GAME_MODE_MAIN;
     game_status = GAME_MODE_TITLE;
 
     DrawTitleScreen();
@@ -1485,11 +1485,12 @@ void DrawMainMenu()
   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);
+  DrawMaskedBorder(fade_mask);
 
   FadeIn(fade_mask);
   FadeSetEnterMenu();
@@ -1542,9 +1543,6 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   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)
@@ -1556,7 +1554,15 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     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)
       {
@@ -1571,22 +1577,17 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       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);
 
@@ -1602,8 +1603,6 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
     FadeIn(REDRAW_ALL);
 
-    fading = fading_next;
-
     DelayReached(&title_delay, 0);	/* reset delay counter */
 
     return;
@@ -1618,11 +1617,11 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   }
   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;
@@ -1641,6 +1640,8 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       if (music == MUS_UNDEFINED || music != last_music)
 	FadeMusic();
 
+      fading = getTitleFading(tci);
+
       FadeOut(REDRAW_ALL);
 
       if (tci->is_image)
@@ -1648,8 +1649,6 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       else
 	DrawTitleScreenMessage(tci->local_nr, tci->initial);
 
-      fading_next = getTitleFading(tci);
-
       sound = getTitleSound(tci);
       music = getTitleMusic(tci);
 
@@ -1661,15 +1660,8 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       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
@@ -1687,8 +1679,9 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     /* 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();
@@ -1826,6 +1819,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   }
   else if (pos == MAIN_CONTROL_LEVEL_NUMBER && !button)
   {
+    StopAnimation();
+
+    CloseDoor(DOOR_CLOSE_2);
+
     game_status = GAME_MODE_LEVELNR;
 
     ChangeViewportPropertiesIfNeeded();
@@ -1860,6 +1857,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       {
 	if (leveldir_first)
 	{
+	  StopAnimation();
+
+	  CloseDoor(DOOR_CLOSE_2);
+
 	  game_status = GAME_MODE_LEVELS;
 
 	  SaveLevelSetup_LastSeries();
@@ -1875,6 +1876,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (pos == MAIN_CONTROL_SCORES)
       {
+	StopAnimation();
+
+	CloseDoor(DOOR_CLOSE_2);
+
 	game_status = GAME_MODE_SCORES;
 
 	DrawHallOfFame(-1);
@@ -1885,6 +1890,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 	    !strEqual(setup.player_name, "Artsoft"))
 	  Request("This level is read only!", REQ_CONFIRM);
 
+	StopAnimation();
+
 	CloseDoor(DOOR_CLOSE_2);
 
 	game_status = GAME_MODE_EDITOR;
@@ -1895,6 +1902,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (pos == MAIN_CONTROL_INFO)
       {
+	StopAnimation();
+
+	CloseDoor(DOOR_CLOSE_2);
+
 	game_status = GAME_MODE_INFO;
 	info_mode = INFO_MODE_MAIN;
 
@@ -1904,10 +1915,16 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       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;
 
@@ -2134,12 +2151,9 @@ static void DrawInfoScreen_Main()
 
   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();
 
@@ -2164,6 +2178,11 @@ static void DrawInfoScreen_Main()
   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);
@@ -2642,6 +2661,9 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
 
 void DrawInfoScreen_TitleScreen()
 {
+  game_status_last_screen = GAME_MODE_INFO;
+  game_status = GAME_MODE_TITLE;
+
   DrawTitleScreen();
 }
 
@@ -3635,11 +3657,15 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
 
   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();
@@ -4145,8 +4171,12 @@ void DrawHallOfFame(int highlight_position)
   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);
 }
 
@@ -5744,6 +5774,8 @@ static void DrawSetupScreen_Generic()
 
   FadeOut(fade_mask);
 
+  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
   ClearField();
 
   if (setup_mode == SETUP_MODE_MAIN)
@@ -5831,6 +5863,8 @@ static void DrawSetupScreen_Generic()
   if (redraw_all)
     redraw_mask = fade_mask = REDRAW_ALL;
 
+  DrawMaskedBorder(fade_mask);
+
   FadeIn(fade_mask);
 
   InitAnimation();