X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=c45e9badb79740cadbf519c085d788bd2ad14f4d;hp=1f94c7850526b018393acae400a9c0b37980e86c;hb=ff45a13c41aeeb995cb556c3f3b7f7be477fc214;hpb=064971ae82e2e3f98dc55e75b15c192c9165fb4e

diff --git a/src/screens.c b/src/screens.c
index 1f94c785..c45e9bad 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -326,11 +326,12 @@ static struct
   char *text;
 } snapshot_modes_list[] =
 {
-  {	STR_SNAPSHOT_MODE_OFF,		"Off"		},
-  {	STR_SNAPSHOT_MODE_EVERY_STEP,	"Every Step"	},
-  {	STR_SNAPSHOT_MODE_EVERY_MOVE,	"Every Move"	},
+  {	STR_SNAPSHOT_MODE_OFF,			"Off"		},
+  {	STR_SNAPSHOT_MODE_EVERY_STEP,		"Every Step"	},
+  {	STR_SNAPSHOT_MODE_EVERY_MOVE,		"Every Move"	},
+  {	STR_SNAPSHOT_MODE_EVERY_COLLECT,	"Every Collect"	},
 
-  {	NULL,			 	NULL		},
+  {	NULL,			 		NULL		},
 };
 
 static struct
@@ -455,6 +456,7 @@ struct TitleControlInfo
 {
   boolean is_image;
   boolean initial;
+  boolean first;
   int local_nr;
   int sort_priority;
 };
@@ -803,44 +805,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 +859,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 +903,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)
@@ -1563,12 +1555,21 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     last_sound = SND_UNDEFINED;
     last_music = MUS_UNDEFINED;
 
-    FadeSetEnterScreen();
+    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.");
 
@@ -1622,8 +1623,6 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   {
     if (game_status_last_screen == GAME_MODE_INFO && num_title_screens == 0)
     {
-      FadeSetEnterScreen();
-
       game_status = GAME_MODE_INFO;
       info_mode = INFO_MODE_MAIN;