fade sounds and music for main menu when entering other screen or menu

diff --git a/src/editor.c b/src/editor.c
index 862a1866adcccb181eaa59dc09ee027ca11951c9..04d03e1b24e703b4a0247556e1fa218ff3b1c606 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -7623,6 +7623,8 @@ void DrawLevelEd()
 {
   int fade_mask = REDRAW_FIELD;
 
+  FadeSoundsAndMusic();
+
   /* needed if different viewport properties defined for editor */
   ChangeViewportPropertiesIfNeeded();
 

diff --git a/src/game.c b/src/game.c
index 29303a7e2f75eb069f2d18bb80d21beae9f9b3a3..c754fc186f0d08505356b474feb65032b98e6512 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -3113,6 +3113,8 @@ void InitGame()
   if (CheckIfGlobalBorderHasChanged())
     fade_mask = REDRAW_ALL;
 
+  FadeSoundsAndMusic();
+
   ExpireSoundLoops(TRUE);
 
   FadeOut(fade_mask);

diff --git a/src/screens.c b/src/screens.c
index d6377c1d4254aa70921996e9aa79a2cbab898008..c6e3c645c87796d4690ea98663725436cdbfbd8d 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -2170,6 +2170,7 @@ static void DrawInfoScreen_Main()
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
+  FadeSoundsAndMusic();
 
   FreeScreenGadgets();
   CreateScreenGadgets();
@@ -4075,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);
@@ -4092,6 +4095,8 @@ void DrawChooseLevelNr()
 {
   int i;
 
+  FadeSoundsAndMusic();
+
   if (level_number != NULL)
   {
     freeTreeInfo(level_number);
@@ -5787,6 +5792,7 @@ static void DrawSetupScreen_Generic()
     fade_mask = REDRAW_ALL;
 
   UnmapAllGadgets();
+  FadeSoundsAndMusic();
 
   FreeScreenGadgets();
   CreateScreenGadgets();