diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index 060a15d2ab..534f05ec3d 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -95,7 +95,6 @@ - @@ -266,13 +265,10 @@ - - - diff --git a/OpenRA.Game/FileFormats/AudLoader.cs b/OpenRA.Mods.Common/AudioLoaders/AudLoader.cs similarity index 99% rename from OpenRA.Game/FileFormats/AudLoader.cs rename to OpenRA.Mods.Common/AudioLoaders/AudLoader.cs index 5ff08becd6..3f7c5ced4f 100644 --- a/OpenRA.Game/FileFormats/AudLoader.cs +++ b/OpenRA.Mods.Common/AudioLoaders/AudLoader.cs @@ -12,7 +12,7 @@ using System; using System.IO; -namespace OpenRA.FileFormats +namespace OpenRA.Mods.Common.AudioLoaders { [Flags] enum SoundFlags diff --git a/OpenRA.Game/FileFormats/ImaAdpcmLoader.cs b/OpenRA.Mods.Common/AudioLoaders/ImaAdpcmLoader.cs similarity index 98% rename from OpenRA.Game/FileFormats/ImaAdpcmLoader.cs rename to OpenRA.Mods.Common/AudioLoaders/ImaAdpcmLoader.cs index 3e110fbb70..0aa47be2cf 100644 --- a/OpenRA.Game/FileFormats/ImaAdpcmLoader.cs +++ b/OpenRA.Mods.Common/AudioLoaders/ImaAdpcmLoader.cs @@ -11,7 +11,7 @@ using System.IO; -namespace OpenRA.FileFormats +namespace OpenRA.Mods.Common.AudioLoaders { struct ImaAdpcmChunk { diff --git a/OpenRA.Game/FileFormats/VocLoader.cs b/OpenRA.Mods.Common/AudioLoaders/VocLoader.cs similarity index 99% rename from OpenRA.Game/FileFormats/VocLoader.cs rename to OpenRA.Mods.Common/AudioLoaders/VocLoader.cs index e291d68bc8..142ad41069 100644 --- a/OpenRA.Game/FileFormats/VocLoader.cs +++ b/OpenRA.Mods.Common/AudioLoaders/VocLoader.cs @@ -14,7 +14,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace OpenRA.FileFormats +namespace OpenRA.Mods.Common.AudioLoaders { public class VocLoader : ISoundLoader { diff --git a/OpenRA.Game/FileFormats/WavLoader.cs b/OpenRA.Mods.Common/AudioLoaders/WavLoader.cs similarity index 99% rename from OpenRA.Game/FileFormats/WavLoader.cs rename to OpenRA.Mods.Common/AudioLoaders/WavLoader.cs index a5bbdc571a..c9c5df9cfe 100644 --- a/OpenRA.Game/FileFormats/WavLoader.cs +++ b/OpenRA.Mods.Common/AudioLoaders/WavLoader.cs @@ -12,7 +12,7 @@ using System; using System.IO; -namespace OpenRA.FileFormats +namespace OpenRA.Mods.Common.AudioLoaders { public class WavLoader : ISoundLoader { diff --git a/OpenRA.Mods.Common/FileFormats/VqaReader.cs b/OpenRA.Mods.Common/FileFormats/VqaReader.cs index eec719f02e..f5a9e584f4 100644 --- a/OpenRA.Mods.Common/FileFormats/VqaReader.cs +++ b/OpenRA.Mods.Common/FileFormats/VqaReader.cs @@ -12,6 +12,7 @@ using System; using System.IO; using OpenRA.FileFormats; +using OpenRA.Mods.Common.AudioLoaders; namespace OpenRA.Mods.Common.FileFormats { diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index d9488d42f6..e4d2a4967f 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -146,6 +146,10 @@ + + + +