Make the sound engine less dumb about music. Fix the music player not knowing about already playing tracks.

2011-05-18 18:58:33 +12:00
parent 42d8722cbc
commit c76d2e37dc
5 changed files with 32 additions and 30 deletions
--- a/OpenRA.Mods.Cnc/Missions/CncShellmapScript.cs
+++ b/OpenRA.Mods.Cnc/Missions/CncShellmapScript.cs
@@ -51,10 +51,10 @@ namespace OpenRA.Mods.RA
 		{
 			if (!Game.Settings.Game.ShellmapMusic ||
 			    	Info.Music == null ||
-			    	!Rules.Music[Info.Music].Exists)
+			    	!Rules.Music.ContainsKey(Info.Music))
 				return;

-			Sound.PlayMusicThen(Rules.Music[Info.Music].Filename, () => LoopMusic());
+			Sound.PlayMusicThen(Rules.Music[Info.Music], () => LoopMusic());
 		}
 		
 		int ticks = 0;