From a1bc70cb58672ae6dfcf3e8ef931736fa6e4f10f Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 15 Feb 2016 00:56:39 +0000 Subject: [PATCH] Use IReadOnlyFileSystem in MusicInfo. --- OpenRA.Game/GameRules/MusicInfo.cs | 7 ++++--- OpenRA.Game/ModData.cs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/GameRules/MusicInfo.cs b/OpenRA.Game/GameRules/MusicInfo.cs index 3cce2d9804..8d623350ea 100644 --- a/OpenRA.Game/GameRules/MusicInfo.cs +++ b/OpenRA.Game/GameRules/MusicInfo.cs @@ -9,6 +9,7 @@ #endregion using OpenRA.FileFormats; +using OpenRA.FileSystem; namespace OpenRA.GameRules { @@ -33,13 +34,13 @@ namespace OpenRA.GameRules Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key) + "." + ext; } - public void Load() + public void Load(IReadOnlyFileSystem filesystem) { - if (!Game.ModData.ModFiles.Exists(Filename)) + if (!filesystem.Exists(Filename)) return; Exists = true; - using (var s = Game.ModData.ModFiles.Open(Filename)) + using (var s = filesystem.Open(Filename)) { if (Filename.ToLowerInvariant().EndsWith("wav")) Length = (int)WavLoader.WaveLength(s); diff --git a/OpenRA.Game/ModData.cs b/OpenRA.Game/ModData.cs index a5ff4915c1..64fcafb742 100644 --- a/OpenRA.Game/ModData.cs +++ b/OpenRA.Game/ModData.cs @@ -182,7 +182,7 @@ namespace OpenRA // Load music with map assets mounted using (new Support.PerfTimer("Map.Music")) foreach (var entry in map.Rules.Music) - entry.Value.Load(); + entry.Value.Load(DefaultFileSystem); VoxelProvider.Initialize(this, Manifest.VoxelSequences, map.VoxelSequenceDefinitions); VoxelLoader.Finish();