From fb631367eaa344c574b13c2200e64f27a3d329ff Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 18 Oct 2015 09:56:12 +0100 Subject: [PATCH] Fix map StartingMusic overriding BackgroundMusic. --- OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs b/OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs index 9fe6ea235a..d0bc536470 100644 --- a/OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs +++ b/OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs @@ -66,9 +66,7 @@ namespace OpenRA.Mods.Common.Traits random = playlist.Shuffle(Game.CosmeticRandom).ToArray(); IsMusicAvailable = playlist.Any(); - if (SongExists(info.StartingMusic)) - currentSong = world.Map.Rules.Music[info.StartingMusic]; - else if (SongExists(info.BackgroundMusic)) + if (SongExists(info.BackgroundMusic)) { currentSong = currentBackgroundSong = world.Map.Rules.Music[info.BackgroundMusic]; CurrentSongIsBackground = true; @@ -81,6 +79,12 @@ namespace OpenRA.Mods.Common.Traits currentSong = random.FirstOrDefault(); } + if (SongExists(info.StartingMusic)) + { + currentSong = world.Map.Rules.Music[info.StartingMusic]; + CurrentSongIsBackground = false; + } + Play(); }