X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=c6e3c645c87796d4690ea98663725436cdbfbd8d;hb=5ec676ef38bff27c6ad93a6803228f0e5f639e21;hp=b86aa1c92c535d7e762efa4b44baeffd187e0ac3;hpb=bc6e19a34de8c4c290dc3c6bee70ac805525070b;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index b86aa1c9..c6e3c645 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -725,6 +725,13 @@ static int getTitleMessageGameMode(boolean initial)
   return (initial ? GAME_MODE_TITLE_INITIAL : GAME_MODE_TITLE);
 }
 
+static int getTitleAnimMode(struct TitleControlInfo *tci)
+{
+  int base = (tci->initial ? GAME_MODE_TITLE_INITIAL_1 : GAME_MODE_TITLE_1);
+
+  return base + tci->local_nr;
+}
+
 #if 0
 static int getTitleScreenBackground(boolean initial)
 {
@@ -1393,6 +1400,8 @@ void DrawMainMenu()
   UnmapAllGadgets();
   FadeSoundsAndMusic();
 
+  ExpireSoundLoops(FALSE);
+
   KeyboardAutoRepeatOn();
   ActivateJoystick();
 
@@ -1565,6 +1574,8 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     title_screen_nr = 0;
     tci = &title_controls[title_screen_nr];
 
+    SetAnimStatus(getTitleAnimMode(tci));
+
     last_sound = SND_UNDEFINED;
     last_music = MUS_UNDEFINED;
 
@@ -1645,10 +1656,13 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
     }
 
     title_screen_nr++;
-    tci = &title_controls[title_screen_nr];
 
     if (title_screen_nr < num_title_screens)
     {
+      tci = &title_controls[title_screen_nr];
+
+      SetAnimStatus(getTitleAnimMode(tci));
+
       sound = getTitleSound(tci);
       music = getTitleMusic(tci);
 
@@ -2156,6 +2170,7 @@ static void DrawInfoScreen_Main()
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
+  FadeSoundsAndMusic();
 
   FreeScreenGadgets();
   CreateScreenGadgets();
@@ -4061,6 +4076,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
 void DrawChooseLevelSet()
 {
+  FadeSoundsAndMusic();
+
   SetMainBackgroundImage(IMG_BACKGROUND_LEVELS);
 
   DrawChooseTree(&leveldir_current);
@@ -4078,6 +4095,8 @@ void DrawChooseLevelNr()
 {
   int i;
 
+  FadeSoundsAndMusic();
+
   if (level_number != NULL)
   {
     freeTreeInfo(level_number);
@@ -5773,6 +5792,7 @@ static void DrawSetupScreen_Generic()
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
+  FadeSoundsAndMusic();
 
   FreeScreenGadgets();
   CreateScreenGadgets();