rnd-20031116-1-src

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 8e66c8c9ed7831cc55f2c2b163dab62f8d2a1812..97eabb96539c21c9390ff67fbe21acff3c85f68c 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -197,7 +197,7 @@ void DrawMainMenu()
   int i;
 
   UnmapAllGadgets();
-  FadeSounds();
+  FadeSoundsAndMusic();
 
   KeyboardAutoRepeatOn();
   ActivateJoystick();
@@ -961,7 +961,7 @@ void DrawHelpScreenMusicText(int num)
   int ystart = 150, ystep = 30;
   int ybottom = SYSIZE - 20;
 
-  FadeSounds();
+  FadeSoundsAndMusic();
   ClearWindow();
   DrawHeadline();
 
@@ -990,7 +990,7 @@ void DrawHelpScreenCreditsText()
   int ystart = 150, ystep = 30;
   int ybottom = SYSIZE - 20;
 
-  FadeSounds();
+  FadeSoundsAndMusic();
   ClearWindow();
   DrawHeadline();
 
@@ -1063,11 +1063,16 @@ void DrawHelpScreen()
   FadeToFront();
   InitAnimation();
 
+#if 1
+  PlaySound(SND_BACKGROUND_INFO);
+  PlayMusic(MUS_BACKGROUND_INFO);
+#else
 #if 0
   PlaySoundLoop(SND_BACKGROUND_INFO);
 #else
   PlaySound_Menu_Start(SND_BACKGROUND_INFO);
 #endif
+#endif
 }
 
 void HandleHelpScreen(int button)
@@ -1110,7 +1115,7 @@ void HandleHelpScreen(int button)
     }
     else
     {
-      FadeSounds();
+      FadeSoundsAndMusic();
 
       game_status = GAME_MODE_MAIN;
       DrawMainMenu();
@@ -1127,10 +1132,12 @@ void HandleHelpScreen(int button)
     /* !!! workaround for playing "music" that is really a sound loop (and
        must therefore periodically be reactivated with the current sound
        engine !!! */
+#if 0
 #if 0
     PlaySoundLoop(SND_BACKGROUND_INFO);
 #else
     PlaySound_Menu_Continue(SND_BACKGROUND_INFO);
+#endif
 #endif
   }
 
@@ -1562,7 +1569,7 @@ void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
 void DrawHallOfFame(int highlight_position)
 {
   UnmapAllGadgets();
-  FadeSounds();
+  FadeSoundsAndMusic();
   CloseDoor(DOOR_CLOSE_2);
 
   if (highlight_position < 0) 
@@ -1573,11 +1580,16 @@ void DrawHallOfFame(int highlight_position)
 
   HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE);
 
+#if 1
+  PlaySound(SND_BACKGROUND_SCORES);
+  PlayMusic(MUS_BACKGROUND_SCORES);
+#else
 #if 0
   PlaySound(SND_BACKGROUND_SCORES);
 #else
   PlaySound_Menu_Start(SND_BACKGROUND_SCORES);
 #endif
+#endif
 }
 
 static void drawHallOfFameList(int first_entry, int highlight_position)
@@ -1662,9 +1674,11 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
     DrawMainMenu();
   }
 
+#if 0
 #if 1
   if (game_status == GAME_MODE_SCORES)
     PlaySound_Menu_Continue(SND_BACKGROUND_SCORES);
+#endif
 #endif
 
   DoAnimation();