X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=b7e4572ab1e14d4bf778983386847db50930aa5d;hb=9233f6cfc90e72b7cc168c570fdd2e545f698674;hp=a1ef1ce3e3082f985718af82c50653986e925242;hpb=0868de4751d9e3d4b2f3185c52edb5569217d39a;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index a1ef1ce3..b7e4572a 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -257,7 +257,6 @@ struct TitleControlInfo
 
 struct TitleControlInfo title_controls[MAX_NUM_TITLE_SCREENS];
 
-
 /* main menu display and control definitions */
 
 #define MAIN_CONTROL_NAME			0
@@ -494,6 +493,162 @@ static struct TitleMessageInfo *getTitleMessageInfo(int nr, boolean initial)
   return (initial ? &titlemessage_initial[nr] : &titlemessage[nr]);
 }
 
+#if 0
+static int getTitleScreenGameMode(boolean initial)
+{
+  return (initial ? GAME_MODE_TITLE_INITIAL : GAME_MODE_TITLE);
+}
+#endif
+
+static int getTitleMessageGameMode(boolean initial)
+{
+  return (initial ? GAME_MODE_TITLE_INITIAL : GAME_MODE_TITLE);
+}
+
+#if 0
+static int getTitleScreenBackground(boolean initial)
+{
+  return (initial ? IMG_BACKGROUND_TITLE_INITIAL : IMG_BACKGROUND_TITLE);
+}
+#endif
+
+#if 0
+static int getTitleMessageBackground(int nr, boolean initial)
+{
+  return (initial ? IMG_BACKGROUND_TITLE_INITIAL : IMG_BACKGROUND_TITLE);
+}
+#endif
+
+static int getTitleBackground(int nr, boolean initial, boolean is_image)
+{
+  int base = (is_image ?
+	      (initial ? IMG_BACKGROUND_TITLESCREEN_INITIAL_1 :
+	                 IMG_BACKGROUND_TITLESCREEN_1) :
+	      (initial ? IMG_BACKGROUND_TITLEMESSAGE_INITIAL_1 :
+	                 IMG_BACKGROUND_TITLEMESSAGE_1));
+  int graphic_global = (initial ? IMG_BACKGROUND_TITLE_INITIAL :
+			          IMG_BACKGROUND_TITLE);
+  int graphic_local = base + nr;
+
+  if (graphic_info[graphic_local].bitmap != NULL)
+    return graphic_local;
+
+  if (graphic_info[graphic_global].bitmap != NULL)
+    return graphic_global;
+
+  return IMG_UNDEFINED;
+}
+
+static int getTitleSound(struct TitleControlInfo *tci)
+{
+  boolean is_image = tci->is_image;
+  int initial = tci->initial;
+  int nr = tci->local_nr;
+  int mode = (initial ? GAME_MODE_TITLE_INITIAL : GAME_MODE_TITLE);
+  int base = (is_image ?
+	      (initial ? SND_BACKGROUND_TITLESCREEN_INITIAL_1 :
+	                 SND_BACKGROUND_TITLESCREEN_1) :
+	      (initial ? SND_BACKGROUND_TITLEMESSAGE_INITIAL_1 :
+	                 SND_BACKGROUND_TITLEMESSAGE_1));
+  int sound_global = menu.sound[mode];
+  int sound_local = base + nr;
+
+#if 0
+  printf("::: %d, %d, %d: %d ['%s'], %d ['%s']\n",
+	 nr, initial, is_image,
+	 sound_global, getSoundListEntry(sound_global)->filename,
+	 sound_local, getSoundListEntry(sound_local)->filename);
+#endif
+
+  if (!strEqual(getSoundListEntry(sound_local)->filename, UNDEFINED_FILENAME))
+    return sound_local;
+
+  if (!strEqual(getSoundListEntry(sound_global)->filename, UNDEFINED_FILENAME))
+    return sound_global;
+
+  return SND_UNDEFINED;
+}
+
+static int getTitleMusic(struct TitleControlInfo *tci)
+{
+  boolean is_image = tci->is_image;
+  int initial = tci->initial;
+  int nr = tci->local_nr;
+  int mode = (initial ? GAME_MODE_TITLE_INITIAL : GAME_MODE_TITLE);
+  int base = (is_image ?
+	      (initial ? MUS_BACKGROUND_TITLESCREEN_INITIAL_1 :
+	                 MUS_BACKGROUND_TITLESCREEN_1) :
+	      (initial ? MUS_BACKGROUND_TITLEMESSAGE_INITIAL_1 :
+	                 MUS_BACKGROUND_TITLEMESSAGE_1));
+  int music_global = menu.music[mode];
+  int music_local = base + nr;
+
+#if 0
+  printf("::: %d, %d, %d: %d ['%s'], %d ['%s']\n",
+	 nr, initial, is_image,
+	 music_global, getMusicListEntry(music_global)->filename,
+	 music_local, getMusicListEntry(music_local)->filename);
+#endif
+
+  if (!strEqual(getMusicListEntry(music_local)->filename, UNDEFINED_FILENAME))
+    return music_local;
+
+  if (!strEqual(getMusicListEntry(music_global)->filename, UNDEFINED_FILENAME))
+    return music_global;
+
+  return MUS_UNDEFINED;
+}
+
+static struct TitleFadingInfo getTitleFading(struct TitleControlInfo *tci)
+{
+  boolean is_image = tci->is_image;
+  int initial = tci->initial;
+  int nr = tci->local_nr;
+  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;
+    }
+  }
+
+#if 0
+  if (ti.anim_mode == ANIM_NONE)
+    ti.fade_delay = ti.post_delay = 0;
+#endif
+
+  return ti;
+}
+
 static int compareTitleControlInfo(const void *object1, const void *object2)
 {
   const struct TitleControlInfo *tci1 = (struct TitleControlInfo *)object1;
@@ -926,11 +1081,12 @@ void DrawTitleScreenImage(int nr, boolean initial)
     height = WIN_YSIZE;
   }
 
+  /* always display title screens centered */
   dst_x = (WIN_XSIZE - width) / 2;
   dst_y = (WIN_YSIZE - height) / 2;
 
   SetDrawBackgroundMask(REDRAW_ALL);
-  SetWindowBackgroundImage(IMG_BACKGROUND_TITLE);
+  SetWindowBackgroundImage(getTitleBackground(nr, initial, TRUE));
 
   ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
@@ -942,17 +1098,28 @@ void DrawTitleScreenImage(int nr, boolean initial)
   redraw_mask = REDRAW_ALL;
 
   /* reset fading control values to default config settings */
+#if 1
+
+#if 0
+  title = getTitleFading(nr, initial, TRUE);
+#endif
+
+#else
+
   title.fade_delay_final = title.fade_delay;
   title.post_delay_final = title.post_delay;
   title.auto_delay_final = title.auto_delay;
 
   /* override default settings with image config settings, if defined */
+  if (graphic_info[graphic].anim_mode != ANIM_DEFAULT)
+    title.anim_mode = graphic_info[graphic].anim_mode;
   if (graphic_info[graphic].fade_delay > -1)
-    title.fade_delay_final = graphic_info[graphic].fade_delay;
+    title.fade_delay = graphic_info[graphic].fade_delay;
   if (graphic_info[graphic].post_delay > -1)
-    title.post_delay_final = graphic_info[graphic].post_delay;
+    title.post_delay = graphic_info[graphic].post_delay;
   if (graphic_info[graphic].auto_delay > -1)
-    title.auto_delay_final = graphic_info[graphic].auto_delay;
+    title.auto_delay = graphic_info[graphic].auto_delay;
+#endif
 }
 
 void DrawTitleScreenMessage(int nr, boolean initial)
@@ -975,8 +1142,8 @@ void DrawTitleScreenMessage(int nr, boolean initial)
   if (filename == NULL)
     return;
 
-  /* force MESSAGE font on title message screen */
-  game_status = GAME_MODE_MESSAGE;
+  /* force TITLE font on title message screen */
+  game_status = getTitleMessageGameMode(initial);
 
   /* if chars set to "-1", automatically determine by text and font width */
   if (tmi->chars == -1)
@@ -991,7 +1158,7 @@ void DrawTitleScreenMessage(int nr, boolean initial)
     tmi->height = tmi->lines * getFontHeight(tmi->font);
 
   SetDrawBackgroundMask(REDRAW_ALL);
-  SetWindowBackgroundImage(IMG_BACKGROUND_MESSAGE);
+  SetWindowBackgroundImage(getTitleBackground(nr, initial, FALSE));
 
   ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
@@ -1005,11 +1172,11 @@ void DrawTitleScreenMessage(int nr, boolean initial)
 #if 1
   DrawTextFile(ALIGNED_TEXT_XPOS(tmi), ALIGNED_TEXT_YPOS(tmi),
 	       filename, tmi->font, tmi->chars, -1, tmi->lines, -1,
-	       tmi->autowrap, tmi->centered, tmi->skip_comments);
+	       tmi->autowrap, tmi->centered, tmi->parse_comments);
 #else
   DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1,
 	       max_lines_per_screen, -1, tmi->autowrap, tmi->centered,
-	       tmi->skip_comments);
+	       tmi->parse_comments);
 #endif
 
   game_status = last_game_status;	/* restore current game status */
@@ -1058,6 +1225,20 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   int i;
 #endif
 
+#if 0
+  /* !!! CHANGE THIS !!! */
+  title = title_default;
+#endif
+
+#if 0
+  printf("::: %d, %d\n", fading.anim_mode == ANIM_CROSSFADE,
+	 redraw_mask == REDRAW_ALL);
+#endif
+
+#if 1
+  FadeOut(redraw_mask);
+#endif
+
   UnmapAllGadgets();
   FadeSoundsAndMusic();
 
@@ -1103,6 +1284,11 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   SetDrawtoField(DRAW_BACKBUFFER);
 #endif
 
+#if 0
+  if (levelset_has_changed)
+    fading = title_default;
+#endif
+
 #if 1
   if (CheckTitleScreen(levelset_has_changed))
   {
@@ -1138,6 +1324,32 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   LoadLevel(level_nr);
 
   SetMainBackgroundImage(IMG_BACKGROUND_MAIN);
+
+#if 0
+  FadeOut(redraw_mask);
+#endif
+
+#if 1
+  if (redraw_mask == REDRAW_ALL)
+  {
+#if 0
+    int door_state = GetDoorState();
+#endif
+
+    RedrawBackground();
+
+    // OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
+#if 0
+#if 1
+    OpenDoor(DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+#else
+    OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+#endif
+#endif
+  }
+#endif
+
   ClearWindow();
 
 #if 1
@@ -1227,16 +1439,63 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading)
   FreeScreenGadgets();
   CreateScreenGadgets();
 
+#if 0
+  BlitBitmap(drawto, window, VX, VY, VXSIZE, VYSIZE, VX, VY);
+  Delay(3000);
+#endif
+
   /* map gadgets for main menu screen */
   MapTapeButtons();
   MapScreenMenuGadgets(SCREEN_MASK_MAIN);
 
   DrawMaskedBorder(REDRAW_ALL);
 
+#if 1
+  if (redraw_mask == REDRAW_ALL)
+  {
+    int door_state = GetDoorState();
+
+    OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+  }
+#endif
+
+#if 0
+ {
+   game_status = GAME_MODE_PSEUDO_PREVIEW;
+
+   DrawText(20, 400, "text_3.PREVIEW", FONT_TEXT_3);
+   DrawText(20, 420, "text_4.PREVIEW", FONT_TEXT_4);
+
+   game_status = GAME_MODE_MAIN;
+
+   DrawText(20, 440, "text_3.MAIN", FONT_TEXT_3);
+   DrawText(20, 460, "text_4.MAIN", FONT_TEXT_4);
+ }
+#endif
+
+#if 1
+  FadeIn(redraw_mask);
+#else
+#if 1
+  if (!do_fading)
+    BackToFront();
+  else if (fading.anim_mode == ANIM_CROSSFADE)
+    FadeCross(redraw_mask);
+  else
+    FadeIn(redraw_mask);
+#else
   if (do_fading)
     FadeIn(redraw_mask);
   else
     BackToFront();
+#endif
+#endif
+
+#if 1
+  FadeSetEnterMenu();
+#else
+  fading = title_default;
+#endif
 
   SetMouseCursor(CURSOR_DEFAULT);
 
@@ -1286,28 +1545,42 @@ static void gotoTopLevelDir()
 }
 #endif
 
-#if 1
 void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 {
   static unsigned long title_delay = 0;
   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;
+#if 0
 #if 1
   boolean use_cross_fading = FALSE;
 #else
   boolean use_cross_fading = !show_title_initial;		/* default */
+#endif
 #endif
   struct TitleControlInfo *tci;
+  struct TitleFadingInfo fading_last = fading;
+  struct TitleFadingInfo fading_next;
+  int sound, music;
 
   if (button == MB_MENU_INITIALIZE)
   {
+#if 0
+    boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE);
+#endif
+
+#if 0
     int last_game_status = game_status;	/* save current game status */
+#endif
 
     title_delay = 0;
     title_screen_nr = 0;
     tci = &title_controls[title_screen_nr];
 
+    last_sound = SND_UNDEFINED;
+    last_music = MUS_UNDEFINED;
+
 #if 0
     /* determine number of title screens to display (images and messages) */
     InitializeTitleControls();
@@ -1320,49 +1593,66 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 	DrawInfoScreen_NotAvailable("Title screen information:",
 				    "No title screen for this level set.");
 
-	title.auto_delay_final = -1;
+#if 0
+	/* use default settings for fading, but always disable auto delay */
+	fading = title_default;
+	fading.auto_delay = -1;
+#endif
 
 	return;
       }
 
       FadeSoundsAndMusic();
 
+#if 1
       FadeOut(REDRAW_ALL);
+#endif
     }
 
-    /* force TITLE music on title info screen */
-    game_status = GAME_MODE_TITLE;
-
-    PlayMenuSound();
-    PlayMenuMusic();
-
-    game_status = last_game_status;	/* restore current game status */
-
     if (tci->is_image)
-    {
       DrawTitleScreenImage(tci->local_nr, tci->initial);
-    }
     else
-    {
       DrawTitleScreenMessage(tci->local_nr, tci->initial);
 
-      title.fade_delay_final = title.fade_delay;
-      title.post_delay_final = title.post_delay;
-      title.auto_delay_final = -1;
-    }
+    fading = fading_next = getTitleFading(tci);
+
+    if (fading_last.fade_mode != FADE_MODE_CROSSFADE &&
+	fading_next.fade_mode == FADE_MODE_CROSSFADE)
+      fading.fade_mode = FADE_MODE_FADE;
+
+#if 1
+    sound = getTitleSound(tci);
+    music = getTitleMusic(tci);
+
+    if (sound != last_sound)
+      PlayMenuSoundExt(sound);
+    if (music != last_music)
+      PlayMenuMusicExt(music);
+
+    last_sound = sound;
+    last_music = music;
+#endif
 
     SetMouseCursor(CURSOR_NONE);
 
+#if 1
     FadeIn(REDRAW_ALL);
+#endif
+
+    fading = fading_next;
 
     DelayReached(&title_delay, 0);	/* reset delay counter */
 
     return;
   }
 
-  if (title.auto_delay_final > -1 &&
-      DelayReached(&title_delay, title.auto_delay_final))
+#if 1
+  if (fading.auto_delay > 0 && DelayReached(&title_delay, fading.auto_delay))
+    button = MB_MENU_CHOICE;
+#else
+  if (fading.auto_delay > -1 && DelayReached(&title_delay, fading.auto_delay))
     button = MB_MENU_CHOICE;
+#endif
 
   if (button == MB_MENU_LEAVE)
   {
@@ -1371,11 +1661,17 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   }
   else if (button == MB_MENU_CHOICE)
   {
-    int anim_mode;
+#if 0
+    boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE);
+#endif
 
     if (game_status == GAME_MODE_INFO && num_title_screens == 0)
     {
+#if 0
       FadeOut(REDRAW_FIELD);
+#endif
+
+      FadeSetStartItem();
 
       info_mode = INFO_MODE_MAIN;
       DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -1386,223 +1682,95 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     title_screen_nr++;
     tci = &title_controls[title_screen_nr];
 
-    if (tci->is_image)
-      anim_mode =
-	graphic_info[getTitleScreenGraphic(tci->local_nr,
-					   tci->initial)].anim_mode;
-    else
-      anim_mode = ANIM_FADE;	/* ??? */
-
-    use_cross_fading = (anim_mode == ANIM_FADE ? FALSE :
-			anim_mode == ANIM_CROSSFADE ? TRUE :
-			use_cross_fading);
-
     if (title_screen_nr < num_title_screens)
     {
-      if (!use_cross_fading)
-	FadeOut(REDRAW_ALL);
-
-      if (use_cross_fading)
-	FadeCrossSaveBackbuffer();
+#if 1
+#if 0
+      boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE);
+#endif
+#else
+      int anim_mode;
 
       if (tci->is_image)
-	DrawTitleScreenImage(tci->local_nr, tci->initial);
-      else
-	DrawTitleScreenMessage(tci->local_nr, tci->initial);
-
-      if (use_cross_fading)
-	FadeCross(REDRAW_ALL);
+	anim_mode =
+	  graphic_info[getTitleScreenGraphic(tci->local_nr,
+					     tci->initial)].anim_mode;
       else
-	FadeIn(REDRAW_ALL);
-
-      DelayReached(&title_delay, 0);	/* reset delay counter */
-    }
-    else
-    {
-      FadeSoundsAndMusic();
-
-      FadeOut(REDRAW_ALL);
-
-      return_to_main_menu = TRUE;
-    }
-  }
-
-  if (return_to_main_menu)
-  {
-    RedrawBackground();
-
-    SetMouseCursor(CURSOR_DEFAULT);
-
-    if (game_status == GAME_MODE_INFO)
-    {
-      OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
-
-      info_mode = INFO_MODE_MAIN;
-      DrawInfoScreenExt(REDRAW_ALL, use_fading_main_menu);
-    }
-    else	/* default: return to main menu */
-    {
-      OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
-
-      game_status = GAME_MODE_MAIN;
-      DrawMainMenuExt(REDRAW_ALL, use_fading_main_menu);
-    }
-  }
-}
-
-#else
-
-void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
-{
-  static unsigned long title_delay = 0;
-  static int title_nr = 0;
-  static boolean showing_message = FALSE;
-  char *filename = getLevelSetMessageFilename();
-  boolean return_to_main_menu = FALSE;
-  boolean use_fading_main_menu = TRUE;
-  boolean use_cross_fading = !show_title_initial;		/* default */
-  boolean no_title_info = (graphic_info[IMG_TITLESCREEN_1].bitmap == NULL &&
-			   getLevelSetMessageFilename(1, FALSE) == NULL);
+	anim_mode = ANIM_FADE;	/* ??? */
 
-  if (button == MB_MENU_INITIALIZE)
-  {
-    int last_game_status = game_status;	/* save current game status */
-
-    title_delay = 0;
-    title_nr = 0;
-    showing_message = FALSE;
-
-    if (show_title_initial &&
-	graphic_info[IMG_TITLESCREEN_INITIAL_1].bitmap == NULL &&
-	getLevelSetMessageFilename(1, TRUE) == NULL)
-      show_title_initial = FALSE;
-
-    if (game_status == GAME_MODE_INFO)
-    {
-      if (no_title_info)
-      {
-	DrawInfoScreen_NotAvailable("Title screen information:",
-				    "No title screen for this level set.");
+      use_cross_fading = (anim_mode == ANIM_FADE ? FALSE :
+			  anim_mode == ANIM_CROSSFADE ? TRUE :
+			  use_cross_fading);
+#endif
 
-	title.auto_delay_final = -1;
+      sound = getTitleSound(tci);
+      music = getTitleMusic(tci);
 
-	return;
-      }
-
-      FadeSoundsAndMusic();
+      if (sound == SND_UNDEFINED || sound != last_sound)
+	FadeSounds();
+      if (music == MUS_UNDEFINED || music != last_music)
+	FadeMusic();
 
+#if 1
       FadeOut(REDRAW_ALL);
-    }
-
-    /* force TITLE music on title info screen */
-    game_status = GAME_MODE_TITLE;
-
-    PlayMenuSound();
-    PlayMenuMusic();
-
-    game_status = last_game_status;	/* restore current game status */
-
-    if (graphic_info[getTitleScreenGraphic(0, show_title_initial)].bitmap != NULL)
-    {
-      DrawTitleScreenImage(title_nr, show_title_initial);
-    }
-    else
-    {
-      DrawTitleScreenMessage(filename);
-
-      showing_message = TRUE;
-
-      title.fade_delay_final = title.fade_delay;
-      title.post_delay_final = title.post_delay;
-      title.auto_delay_final = -1;
-    }
-
-    FadeIn(REDRAW_ALL);
-
-    DelayReached(&title_delay, 0);	/* reset delay counter */
-
-    return;
-  }
-
-  if (title.auto_delay_final > -1 &&
-      DelayReached(&title_delay, title.auto_delay_final))
-    button = MB_MENU_CHOICE;
-
-  if (button == MB_MENU_LEAVE)
-  {
-    return_to_main_menu = TRUE;
-    use_fading_main_menu = FALSE;
-  }
-  else if (button == MB_MENU_CHOICE)
-  {
-    int anim_mode;
-
-    if (game_status == GAME_MODE_INFO && no_title_info)
-    {
-      FadeOut(REDRAW_FIELD);
-
-      info_mode = INFO_MODE_MAIN;
-      DrawAndFadeInInfoScreen(REDRAW_FIELD);
-
-      return;
-    }
-
-    title_nr++;
-
-    if (show_title_initial &&
-	(title_nr >= MAX_NUM_TITLE_IMAGES ||
-	 graphic_info[IMG_TITLESCREEN_INITIAL_1 + title_nr].bitmap == NULL))
-    {
-      show_title_initial = FALSE;
-
-      title_nr = 0;	/* restart with title screens for current level set */
-    }
+#endif
 
-    anim_mode = graphic_info[getTitleScreenGraphic(title_nr, show_title_initial)].anim_mode;
+      if (tci->is_image)
+	DrawTitleScreenImage(tci->local_nr, tci->initial);
+      else
+	DrawTitleScreenMessage(tci->local_nr, tci->initial);
 
-    use_cross_fading = (anim_mode == ANIM_FADE ? FALSE :
-			anim_mode == ANIM_CROSSFADE ? TRUE :
-			use_cross_fading);
+      fading_next = getTitleFading(tci);
 
-    if (!use_cross_fading)
-      FadeOut(REDRAW_ALL);
+#if 1
+      sound = getTitleSound(tci);
+      music = getTitleMusic(tci);
 
-    if (title_nr < MAX_NUM_TITLE_IMAGES &&
-	graphic_info[getTitleScreenGraphic(title_nr, show_title_initial)].bitmap != NULL)
-    {
-      if (use_cross_fading)
-	FadeCrossSaveBackbuffer();
+      if (sound != last_sound)
+	PlayMenuSoundExt(sound);
+      if (music != last_music)
+	PlayMenuMusicExt(music);
 
-      DrawTitleScreenImage(title_nr, show_title_initial);
+      last_sound = sound;
+      last_music = music;
+#endif
 
-      if (use_cross_fading)
-	FadeCross(REDRAW_ALL);
-      else
-	FadeIn(REDRAW_ALL);
+#if 0
+      printf("::: %d -> %d\n", fading.fade_mode, fading_next.fade_mode);
+#endif
 
-      DelayReached(&title_delay, 0);	/* reset delay counter */
-    }
-    else if (!showing_message && filename != NULL)
-    {
-      if (use_cross_fading)
-	FadeCrossSaveBackbuffer();
+      /* last screen already faded out, next screen has no animation */
+      if (fading.fade_mode      != FADE_MODE_CROSSFADE &&
+	  fading_next.fade_mode == FADE_MODE_NONE)
+	fading = fading_next;
 
-      DrawTitleScreenMessage(filename);
+#if 1
+      FadeIn(REDRAW_ALL);
+#endif
 
-      if (use_cross_fading)
-	FadeCross(REDRAW_ALL);
-      else
-	FadeIn(REDRAW_ALL);
+      fading = fading_next;
 
       DelayReached(&title_delay, 0);	/* reset delay counter */
-
-      showing_message = TRUE;
     }
     else
     {
       FadeSoundsAndMusic();
 
+#if 0
+#if 1
+      {
+#if 0
+	boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE);
+#endif
+
+#if 1
+	FadeOut(REDRAW_ALL);
+#endif
+      }
+#else
       FadeOut(REDRAW_ALL);
+#endif
+#endif
 
       return_to_main_menu = TRUE;
     }
@@ -1610,27 +1778,32 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
 
   if (return_to_main_menu)
   {
-    show_title_initial = FALSE;
-
+#if 0
     RedrawBackground();
+#endif
+
+    SetMouseCursor(CURSOR_DEFAULT);
 
     if (game_status == GAME_MODE_INFO)
     {
+#if 0
       OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+#endif
 
       info_mode = INFO_MODE_MAIN;
       DrawInfoScreenExt(REDRAW_ALL, use_fading_main_menu);
     }
     else	/* default: return to main menu */
     {
+#if 0
       OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+#endif
 
       game_status = GAME_MODE_MAIN;
       DrawMainMenuExt(REDRAW_ALL, use_fading_main_menu);
     }
   }
 }
-#endif
 
 void HandleMainMenu_SelectLevel(int step, int direction)
 {
@@ -1782,6 +1955,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 
 	game_status = GAME_MODE_EDITOR;
 
+	FadeSetStartItem();
+
 	DrawLevelEd();
       }
       else if (pos == MAIN_CONTROL_INFO)
@@ -1789,6 +1964,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 	game_status = GAME_MODE_INFO;
 	info_mode = INFO_MODE_MAIN;
 
+#if 0
+	fading = menu.navigation;
+#endif
+
 	DrawInfoScreen();
       }
       else if (pos == MAIN_CONTROL_GAME)
@@ -1952,50 +2131,86 @@ static int num_info_info;
 
 static void execInfoTitleScreen()
 {
+#if 0
+  FadeSetStartItem();
+#endif
+
   info_mode = INFO_MODE_TITLE;
   DrawInfoScreen();
 }
 
 static void execInfoElements()
 {
+#if 0
+  FadeSetStartItem();
+#endif
+
   info_mode = INFO_MODE_ELEMENTS;
   DrawInfoScreen();
 }
 
 static void execInfoMusic()
 {
+#if 0
+  FadeSetStartItem();
+#endif
+
   info_mode = INFO_MODE_MUSIC;
   DrawInfoScreen();
 }
 
 static void execInfoCredits()
 {
+#if 0
+  FadeSetStartItem();
+#endif
+
   info_mode = INFO_MODE_CREDITS;
   DrawInfoScreen();
 }
 
 static void execInfoProgram()
 {
+#if 0
+  FadeSetStartItem();
+#endif
+
   info_mode = INFO_MODE_PROGRAM;
   DrawInfoScreen();
 }
 
 static void execInfoVersion()
 {
+#if 0
+  FadeSetStartItem();
+#endif
+
   info_mode = INFO_MODE_VERSION;
   DrawInfoScreen();
 }
 
 static void execInfoLevelSet()
 {
+#if 0
+  FadeSetStartItem();
+#endif
+
   info_mode = INFO_MODE_LEVELSET;
   DrawInfoScreen();
 }
 
 static void execExitInfo()
 {
+#if 0
+  FadeSetLeaveMenu();
+#endif
+
   game_status = GAME_MODE_MAIN;
+#if 1
+  DrawMainMenuExt(REDRAW_FIELD, FALSE);
+#else
   DrawMainMenu();
+#endif
 }
 
 static struct TokenInfo info_info_main[] =
@@ -2035,6 +2250,18 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading)
   UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
+#if 1
+  FadeOut(redraw_mask);
+#endif
+
+#if 1
+  if (redraw_mask == REDRAW_ALL)
+  {
+    RedrawBackground();
+    OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+  }
+#endif
+
   ClearWindow();
 
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Info Screen");
@@ -2071,12 +2298,25 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading)
   PlayMenuSound();
   PlayMenuMusic();
 
-  DrawMaskedBorder(REDRAW_ALL);
+  DrawMaskedBorder(redraw_mask);
 
+#if 1
+  FadeIn(redraw_mask);
+#else
+#if 1
+  if (!do_fading)
+    BackToFront();
+  else if (fading.anim_mode == ANIM_CROSSFADE)
+    FadeCross(redraw_mask);
+  else
+    FadeIn(redraw_mask);
+#else
   if (do_fading)
     FadeIn(redraw_mask);
   else
     BackToFront();
+#endif
+#endif
 
   InitAnimation();
 }
@@ -2112,6 +2352,8 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
       {
 	void (*menu_callback_function)(void) = info_info[y].value;
 
+	FadeSetLeaveMenu();
+
 	menu_callback_function();
 
 	break;	/* absolutely needed because function changes 'info_info'! */
@@ -2174,6 +2416,8 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button)
       {
 	void (*menu_callback_function)(void) = info_info[choice].value;
 
+	FadeSetFromType(info_info[y].type);
+
 	menu_callback_function();
       }
     }
@@ -2194,7 +2438,9 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET);
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   ClearWindow();
   DrawHeadline();
@@ -2205,7 +2451,9 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
   DrawTextSCentered(ybottom, FONT_TEXT_4,
 		    "Press any key or button for info menu");
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
@@ -2394,14 +2642,18 @@ void DrawInfoScreen_Elements()
 {
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   LoadHelpAnimInfo();
   LoadHelpTextInfo();
 
   HandleInfoScreen_Elements(MB_MENU_INITIALIZE);
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 
   InitAnimation();
 }
@@ -2457,7 +2709,10 @@ void HandleInfoScreen_Elements(int button)
     if (page >= num_pages)
     {
       FadeSoundsAndMusic();
+
+#if 0
       FadeOut(REDRAW_FIELD);
+#endif
 
       info_mode = INFO_MODE_MAIN;
       DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -2487,7 +2742,9 @@ void DrawInfoScreen_Music()
 {
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC);
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   ClearWindow();
   DrawHeadline();
@@ -2496,7 +2753,9 @@ void DrawInfoScreen_Music()
 
   HandleInfoScreen_Music(MB_MENU_INITIALIZE);
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 void HandleInfoScreen_Music(int button)
@@ -2554,7 +2813,10 @@ void HandleInfoScreen_Music(int button)
     if (list == NULL)
     {
       FadeSoundsAndMusic();
+
+#if 0
       FadeOut(REDRAW_FIELD);
+#endif
 
       info_mode = INFO_MODE_MAIN;
       DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -2820,11 +3082,15 @@ void DrawInfoScreen_Credits()
 
   FadeSoundsAndMusic();
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   HandleInfoScreen_Credits(MB_MENU_INITIALIZE);
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 void HandleInfoScreen_Credits(int button)
@@ -2865,7 +3131,10 @@ void HandleInfoScreen_Credits(int button)
     else
     {
       FadeSoundsAndMusic();
+
+#if 0
       FadeOut(REDRAW_FIELD);
+#endif
 
       info_mode = INFO_MODE_MAIN;
       DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -2886,7 +3155,9 @@ void DrawInfoScreen_Program()
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM);
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   ClearWindow();
   DrawHeadline();
@@ -2923,7 +3194,9 @@ void DrawInfoScreen_Program()
   DrawTextSCentered(ybottom, FONT_TEXT_4,
 		    "Press any key or button for info menu");
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 void HandleInfoScreen_Program(int button)
@@ -2942,7 +3215,10 @@ void HandleInfoScreen_Program(int button)
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     FadeSoundsAndMusic();
+
+#if 0
     FadeOut(REDRAW_FIELD);
+#endif
 
     info_mode = INFO_MODE_MAIN;
     DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -2974,7 +3250,9 @@ void DrawInfoScreen_Version()
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   ClearWindow();
   DrawHeadline();
@@ -3085,7 +3363,9 @@ void DrawInfoScreen_Version()
   DrawTextSCentered(ybottom, FONT_TEXT_4,
 		    "Press any key or button for info menu");
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 void HandleInfoScreen_Version(int button)
@@ -3104,7 +3384,10 @@ void HandleInfoScreen_Version(int button)
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     FadeSoundsAndMusic();
+
+#if 0
     FadeOut(REDRAW_FIELD);
+#endif
 
     info_mode = INFO_MODE_MAIN;
     DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -3134,7 +3417,9 @@ void DrawInfoScreen_LevelSet()
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET);
 
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   ClearWindow();
   DrawHeadline();
@@ -3144,7 +3429,7 @@ void DrawInfoScreen_LevelSet()
   if (filename != NULL)
     DrawTextFile(mSX + ALIGNED_TEXT_XPOS(tmi), mSY + ALIGNED_TEXT_YPOS(tmi),
 		 filename, tmi->font, tmi->chars, -1, tmi->lines, -1,
-		 tmi->autowrap, tmi->centered, tmi->skip_comments);
+		 tmi->autowrap, tmi->centered, tmi->parse_comments);
   else
     DrawTextCentered(mSY + ALIGNED_TEXT_YPOS(tmi), FONT_TEXT_2,
 		     "No information for this level set.");
@@ -3152,7 +3437,9 @@ void DrawInfoScreen_LevelSet()
   DrawTextCentered(mSY + SYSIZE - 20, FONT_TEXT_4,
 		   "Press any key or button for info menu");
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 void HandleInfoScreen_LevelSet(int button)
@@ -3171,7 +3458,10 @@ void HandleInfoScreen_LevelSet(int button)
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     FadeSoundsAndMusic();
+
+#if 0
     FadeOut(REDRAW_FIELD);
+#endif
 
     info_mode = INFO_MODE_MAIN;
     DrawAndFadeInInfoScreen(REDRAW_FIELD);
@@ -3219,7 +3509,7 @@ void DrawAndFadeInInfoScreen(int redraw_mask)
 
 void DrawInfoScreen()
 {
-  DrawInfoScreenExt(REDRAW_ALL, FALSE);
+  DrawInfoScreenExt(REDRAW_FIELD, FALSE);
 }
 
 void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
@@ -3385,12 +3675,19 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
 
   CloseDoor(DOOR_CLOSE_2);
 
+#if 1
+  FadeOut(REDRAW_FIELD);
+#endif
+
   ClearWindow();
 
   HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
   MapScreenTreeGadgets(*ti_ptr);
 
-  FadeToFront();
+#if 1
+  FadeIn(REDRAW_FIELD);
+#endif
+
   InitAnimation();
 }
 
@@ -3565,6 +3862,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   }
   else if (button == MB_MENU_LEAVE)
   {
+    FadeSetLeaveMenu();
+
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     if (ti->node_parent)
@@ -3584,7 +3883,11 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     else
     {
       game_status = GAME_MODE_MAIN;
+#if 1
+      DrawMainMenuExt(REDRAW_FIELD, FALSE);
+#else
       DrawMainMenu();
+#endif
     }
 
     return;
@@ -3666,6 +3969,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
     if (node_cursor->node_group)
     {
+      FadeSetEnterMenu();
+
       PlaySound(SND_MENU_ITEM_SELECTING);
 
       node_cursor->cl_first = ti->cl_first;
@@ -3678,6 +3983,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   }
   else if (dx == -1 && ti->node_parent)
   {
+    FadeSetLeaveMenu();
+
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     *ti_ptr = ti->node_parent;
@@ -3716,6 +4023,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
       if (node_cursor->node_group)
       {
+	FadeSetEnterMenu();
+
 	node_cursor->cl_first = ti->cl_first;
 	node_cursor->cl_cursor = ti->cl_cursor;
 	*ti_ptr = node_cursor->node_group;
@@ -3723,11 +4032,15 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       }
       else if (node_cursor->parent_link)
       {
+	FadeSetLeaveMenu();
+
 	*ti_ptr = node_cursor->node_parent;
 	DrawChooseTree(ti_ptr);
       }
       else
       {
+	FadeSetStartItem();
+
 	node_cursor->cl_first = ti->cl_first;
 	node_cursor->cl_cursor = ti->cl_cursor;
 	*ti_ptr = node_cursor;
@@ -3795,7 +4108,11 @@ void DrawHallOfFame(int highlight_position)
   if (highlight_position < 0) 
     LoadScore(level_nr);
 
+  FadeSetStartItem();
+
+#if 1
   FadeOut(REDRAW_FIELD);
+#endif
 
   InitAnimation();
 
@@ -3804,7 +4121,9 @@ void DrawHallOfFame(int highlight_position)
 
   HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE);
 
+#if 1
   FadeIn(REDRAW_FIELD);
+#endif
 }
 
 static void drawHallOfFameList(int first_entry, int highlight_position)
@@ -3899,7 +4218,10 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
     PlaySound(SND_MENU_ITEM_SELECTING);
 
     FadeSound(SND_BACKGROUND_SCORES);
+
+#if 0
     FadeOut(REDRAW_FIELD);
+#endif
 
     game_status = GAME_MODE_MAIN;
 
@@ -3928,12 +4250,20 @@ static char *music_set_name;
 
 static void execSetupMain()
 {
+#if 0
+  FadeSetLeaveMenu();
+#endif
+
   setup_mode = SETUP_MODE_MAIN;
   DrawSetupScreen();
 }
 
 static void execSetupGame()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   if (game_speeds == NULL)
   {
     int i;
@@ -3987,18 +4317,30 @@ static void execSetupGame()
 
 static void execSetupChooseGameSpeed()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_CHOOSE_GAME_SPEED;
   DrawSetupScreen();
 }
 
 static void execSetupEditor()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_EDITOR;
   DrawSetupScreen();
 }
 
 static void execSetupGraphics()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   if (video.fullscreen_available && screen_modes == NULL)
   {
     int i;
@@ -4061,6 +4403,10 @@ static void execSetupGraphics()
 
 static void execSetupChooseScreenMode()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   if (!video.fullscreen_available)
     return;
 
@@ -4070,12 +4416,20 @@ static void execSetupChooseScreenMode()
 
 static void execSetupSound()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_SOUND;
   DrawSetupScreen();
 }
 
 static void execSetupArtwork()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup.graphics_set = artwork.gfx_current->identifier;
   setup.sounds_set = artwork.snd_current->identifier;
   setup.music_set = artwork.mus_current->identifier;
@@ -4094,44 +4448,76 @@ static void execSetupArtwork()
 
 static void execSetupChooseGraphics()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_CHOOSE_GRAPHICS;
   DrawSetupScreen();
 }
 
 static void execSetupChooseSounds()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_CHOOSE_SOUNDS;
   DrawSetupScreen();
 }
 
 static void execSetupChooseMusic()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_CHOOSE_MUSIC;
   DrawSetupScreen();
 }
 
 static void execSetupInput()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_INPUT;
   DrawSetupScreen();
 }
 
 static void execSetupShortcut1()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_SHORTCUT_1;
   DrawSetupScreen();
 }
 
 static void execSetupShortcut2()
 {
+#if 0
+  FadeSetEnterMenu();
+#endif
+
   setup_mode = SETUP_MODE_SHORTCUT_2;
   DrawSetupScreen();
 }
 
 static void execExitSetup()
 {
+#if 0
+  FadeSetLeaveMenu();
+#endif
+
   game_status = GAME_MODE_MAIN;
+#if 1
+  DrawMainMenuExt(REDRAW_FIELD, FALSE);
+#else
   DrawMainMenu();
+#endif
 }
 
 static void execSaveAndExitSetup()
@@ -4526,6 +4912,10 @@ static void DrawSetupScreen_Generic()
   UnmapAllGadgets();
   CloseDoor(DOOR_CLOSE_2);
 
+#if 1
+  FadeOut(REDRAW_FIELD);
+#endif
+
   ClearWindow();
 
   if (setup_mode == SETUP_MODE_MAIN)
@@ -4616,9 +5006,18 @@ static void DrawSetupScreen_Generic()
 		    "Joysticks deactivated in setup menu");
 #endif
 
-  FadeToFront();
+#if 1
+  HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE);
+#endif
+
+#if 1
+  FadeIn(REDRAW_FIELD);
+#endif
+
   InitAnimation();
+#if 0
   HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE);
+#endif
 }
 
 void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
@@ -4654,6 +5053,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
       {
 	void (*menu_callback_function)(void) = setup_info[y].value;
 
+	FadeSetLeaveMenu();
+
 	menu_callback_function();
 
 	break;	/* absolutely needed because function changes 'setup_info'! */
@@ -4724,6 +5125,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button)
       {
 	void (*menu_callback_function)(void) = setup_info[y].value;
 
+	FadeSetFromType(setup_info[y].type);
+
 	menu_callback_function();
       }
       else
@@ -4741,6 +5144,10 @@ void DrawSetupScreen_Input()
   int i;
 #endif
 
+#if 1
+  FadeOut(REDRAW_FIELD);
+#endif
+
   ClearWindow();
 
 #if 1
@@ -4788,7 +5195,11 @@ void DrawSetupScreen_Input()
   MapScreenMenuGadgets(SCREEN_MASK_INPUT);
 
   HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE);
-  FadeToFront();
+
+#if 1
+  FadeIn(REDRAW_FIELD);
+#endif
+
   InitAnimation();
 }
 
@@ -5030,6 +5441,8 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button)
       {
 	InitJoysticks();
 
+	FadeSetLeaveMenu();
+
 	setup_mode = SETUP_MODE_MAIN;
 	DrawSetupScreen();
       }
@@ -5060,12 +5473,17 @@ void CustomizeKeyboard(int player_nr)
   /* read existing key bindings from player setup */
   custom_key = setup.input[player_nr].key;
 
+  FadeSetEnterMenu();
+  FadeOut(REDRAW_FIELD);
+
   ClearWindow();
 
   DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Keyboard Input");
 
+#if 0
   BackToFront();
   InitAnimation();
+#endif
 
   step_nr = 0;
   DrawText(mSX, mSY + (2 + 2 * step_nr) * 32,
@@ -5075,6 +5493,12 @@ void CustomizeKeyboard(int player_nr)
   DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32,
 	   getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD);
 
+#if 1
+  FadeIn(REDRAW_FIELD);
+
+  InitAnimation();
+#endif
+
   while (!finished)
   {
     if (PendingEvent())		/* got event */
@@ -5091,6 +5515,9 @@ void CustomizeKeyboard(int player_nr)
 
 	    if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6))
 	    {
+	      if (key == KSYM_Escape)
+		FadeSkipNextFadeIn();
+
 	      finished = TRUE;
 	      break;
 	    }
@@ -5189,6 +5616,9 @@ static boolean CalibrateJoystickMain(int player_nr)
   if (joystick_fd < 0 || !setup.input[player_nr].use_joystick)
     return FALSE;
 
+  FadeSetEnterMenu();
+  FadeOut(REDRAW_FIELD);
+
   ClearWindow();
 
   for (y = 0; y < 3; y++)
@@ -5220,7 +5650,12 @@ static boolean CalibrateJoystickMain(int player_nr)
   new_joystick_ymiddle = joy_y;
 
   DrawGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0);
+
+#if 1
+  FadeIn(REDRAW_FIELD);
+#else
   BackToFront();
+#endif
 
   while (Joystick(player_nr) & JOY_BUTTON);	/* wait for released button */
   InitAnimation();
@@ -5244,6 +5679,7 @@ static boolean CalibrateJoystickMain(int player_nr)
 	      break;
 
 	    case KSYM_Escape:
+	      FadeSkipNextFadeIn();
 	      result = 0;
 	      break;