epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9666 from pchote/fix-startingmusic-clash

Browse Source 
Fix map StartingMusic overriding BackgroundMusic initialization.
This commit is contained in:
Matthias Mailänder
2015-10-18 19:36:39 +02:00
parent c1dda97836 fb631367ea
commit 742aa01284
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs
View File

@@ -66,9 +66,7 @@ namespace OpenRA.Mods.Common.Traits
random = playlist.Shuffle(Game.CosmeticRandom).ToArray(); random = playlist.Shuffle(Game.CosmeticRandom).ToArray();
IsMusicAvailable = playlist.Any(); IsMusicAvailable = playlist.Any();
if (SongExists(info.StartingMusic)) if (SongExists(info.BackgroundMusic))
currentSong = world.Map.Rules.Music[info.StartingMusic];
else if (SongExists(info.BackgroundMusic))
{ {
currentSong = currentBackgroundSong = world.Map.Rules.Music[info.BackgroundMusic]; currentSong = currentBackgroundSong = world.Map.Rules.Music[info.BackgroundMusic];
CurrentSongIsBackground = true; CurrentSongIsBackground = true;
@@ -81,6 +79,12 @@ namespace OpenRA.Mods.Common.Traits
currentSong = random.FirstOrDefault(); currentSong = random.FirstOrDefault();
} }
if (SongExists(info.StartingMusic))
{
currentSong = world.Map.Rules.Music[info.StartingMusic];
CurrentSongIsBackground = false;
}
Play(); Play();
} }