diff --git a/OpenRA.Game/ContentInstaller.cs b/OpenRA.Game/ContentInstaller.cs new file mode 100644 index 0000000000..58c97afd83 --- /dev/null +++ b/OpenRA.Game/ContentInstaller.cs @@ -0,0 +1,40 @@ +#region Copyright & License Information +/* + * Copyright 2007-2015 The OpenRA Developers (see AUTHORS) + * This file is part of OpenRA, which is free software. It is made + * available to you under the terms of the GNU General Public License + * as published by the Free Software Foundation. For more information, + * see COPYING. + */ +#endregion + +using System.Collections.Generic; + +namespace OpenRA +{ + // Referenced from ModMetadata, so needs to be in OpenRA.Game :( + public class ContentInstaller : IGlobalModData + { + public readonly string MenuWidget = null; + public readonly string MusicMenuWidget = null; + public readonly string BackgroundWidget = null; + public readonly string[] TestFiles = { }; + public readonly string[] DiskTestFiles = { }; + public readonly string PackageToExtractFromCD = null; + public readonly bool OverwriteFiles = true; + + public readonly Dictionary CopyFilesFromCD = new Dictionary(); + public readonly Dictionary ExtractFilesFromCD = new Dictionary(); + + public readonly string PackageMirrorList = null; + + public readonly string MusicPackageMirrorList = null; + public readonly int ShippedSoundtracks = 0; + + /// InstallShield .CAB file IDs, used to extract Mod-specific files. + public readonly HashSet InstallShieldCABFileIds = new HashSet(); + + /// InstallShield .CAB file IDs, used to extract Mod-specific archives and extract contents of ExtractFilesFromCD. + public readonly HashSet InstallShieldCABFilePackageIds = new HashSet(); + } +} diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index e8de19d10a..30dbdd1844 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -95,6 +95,7 @@ + diff --git a/OpenRA.Mods.Common/InstallUtils.cs b/OpenRA.Mods.Common/InstallUtils.cs index 4520561375..decbbeab8d 100644 --- a/OpenRA.Mods.Common/InstallUtils.cs +++ b/OpenRA.Mods.Common/InstallUtils.cs @@ -18,31 +18,6 @@ using OpenRA.FileSystem; namespace OpenRA.Mods.Common { - public class ContentInstaller : IGlobalModData - { - public readonly string MenuWidget = null; - public readonly string MusicMenuWidget = null; - public readonly string BackgroundWidget = null; - public readonly HashSet TestFiles = new HashSet(); - public readonly HashSet DiskTestFiles = new HashSet(); - public readonly string PackageToExtractFromCD = null; - public readonly bool OverwriteFiles = true; - - public readonly Dictionary CopyFilesFromCD = new Dictionary(); - public readonly Dictionary ExtractFilesFromCD = new Dictionary(); - - public readonly string PackageMirrorList = null; - - public readonly string MusicPackageMirrorList = null; - public readonly int ShippedSoundtracks = 0; - - /// InstallShield .cab File Ids, used to extract Mod specific files. - public readonly HashSet InstallShieldCABFileIds = new HashSet(); - - /// InstallShield .cab File Ids, used to extract Mod specific archives and extract contents of ExtractFilesFromCD. - public readonly HashSet InstallShieldCABFilePackageIds = new HashSet(); - } - public static class InstallUtils { static IEnumerable GetEntries(this ZipInputStream z)