Merge remote-tracking branch 'scrawl/music'

apps/openmw/engine.cpp

@@ -646,9 +646,6 @@ void OMW::Engine::go()
 
     prepareEngine (settings);
 
-    // Play some good 'ol tunes
-    MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
-
     if (!mSaveGameFile.empty())
     {
         MWBase::Environment::get().getStateManager()->loadGame(mSaveGameFile);

apps/openmw/mwmechanics/actors.cpp

@@ -1069,18 +1069,18 @@ namespace MWMechanics
             killDeadActors();
 
             // check if we still have any player enemies to switch music
-            static bool isBattleMusic = false;
+            static int currentMusic = 0;
 
-            if (isBattleMusic && hostilesCount == 0 && !(player.getClass().getCreatureStats(player).isDead() &&
+            if (currentMusic != 1 && hostilesCount == 0 && !(player.getClass().getCreatureStats(player).isDead() &&
             MWBase::Environment::get().getSoundManager()->isMusicPlaying()))
             {
                 MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
-                isBattleMusic = false;
+                currentMusic = 1;
             }
-            else if (!isBattleMusic && hostilesCount > 0)
+            else if (currentMusic != 2 && hostilesCount > 0)
             {
                 MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Battle"));
-                isBattleMusic = true;
+                currentMusic = 2;
             }
 
             static float sneakTimer = 0.f; // times update of sneak icon