X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=f6e10265b6e5387dde3f85f6a0d233debf7bbaed;hb=c4e1a476135ce36417cdd797481feeaaff4301af;hp=ab7dbb5576784c19827a55245935f8097e0f98fa;hpb=2ae6ae8ed951e87fcba7c363705cd6ddea8de91c;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index ab7dbb55..f6e10265 100644
--- a/src/game.c
+++ b/src/game.c
@@ -761,8 +761,8 @@ void InitGame()
 
   OpenDoor(DOOR_OPEN_ALL);
 
-  if (setup.sound_music)
-    PlaySoundLoop(background_loop[level_nr % num_bg_loops]);
+  if (setup.sound_music && num_bg_loops)
+    PlayMusic(level_nr % num_bg_loops);
 
   KeyboardAutoRepeatOff();
 
@@ -6227,12 +6227,13 @@ static void HandleGameButtons(struct GadgetInfo *gi)
       if (setup.sound_music)
       { 
 	setup.sound_music = FALSE;
-	FadeSound(background_loop[level_nr % num_bg_loops]);
+	FadeMusic();
       }
       else if (audio.loops_available)
       { 
 	setup.sound = setup.sound_music = TRUE;
-	PlaySoundLoop(background_loop[level_nr % num_bg_loops]);
+	if (num_bg_loops)
+	  PlayMusic(level_nr % num_bg_loops);
       }
       break;