rnd-20001221-1-src

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index ab7dbb5576784c19827a55245935f8097e0f98fa..43a79defded9505ecd75fcf57d106042a84f5e20 100644 (file)
--- 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();
 
@@ -960,7 +960,9 @@ void GameWon()
       StopSound(SND_SIRR);
   }
 
+#if 0
   FadeSounds();
+#endif
 
   /* Hero disappears */
   DrawLevelField(ExitX, ExitY);
@@ -981,7 +983,10 @@ void GameWon()
   {
     leveldir_current->handicap_level++;
     SaveLevelSetup_SeriesInfo();
+  }
 
+  if (!level_editor_test_game)
+  {
     if (level_nr < leveldir_current->last_level)
       raise_level = TRUE;
   }
@@ -6227,12 +6232,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;