diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index cc3b1b4405..01bd0ad968 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -261,7 +261,6 @@ - diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj index f009a0f900..6028f6ca67 100644 --- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj +++ b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj @@ -87,6 +87,7 @@ + mkdir "$(SolutionDir)mods/d2k/" diff --git a/OpenRA.Game/FileSystem/D2kSoundResources.cs b/OpenRA.Mods.D2k/PackageLoaders/D2kSoundResources.cs similarity index 93% rename from OpenRA.Game/FileSystem/D2kSoundResources.cs rename to OpenRA.Mods.D2k/PackageLoaders/D2kSoundResources.cs index 5dea955653..76fe7a85b0 100644 --- a/OpenRA.Game/FileSystem/D2kSoundResources.cs +++ b/OpenRA.Mods.D2k/PackageLoaders/D2kSoundResources.cs @@ -12,8 +12,9 @@ using System; using System.Collections.Generic; using System.IO; +using OpenRA.FileSystem; -namespace OpenRA.FileSystem +namespace OpenRA.Mods.D2k.PackageLoaders { public class D2kSoundResourcesLoader : IPackageLoader { @@ -70,7 +71,7 @@ namespace OpenRA.FileSystem return new MemoryStream(s.ReadBytes((int)e.Length)); } - public IReadOnlyPackage OpenPackage(string filename, FileSystem context) + public IReadOnlyPackage OpenPackage(string filename, FileSystem.FileSystem context) { // Not implemented return null; @@ -87,7 +88,7 @@ namespace OpenRA.FileSystem } } - bool IPackageLoader.TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package) + bool IPackageLoader.TryParsePackage(Stream s, string filename, FileSystem.FileSystem context, out IReadOnlyPackage package) { if (!filename.EndsWith(".rs", StringComparison.InvariantCultureIgnoreCase)) {