epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move InstallShieldPackage to Mods.Common.

Browse Source
This commit is contained in:
Paul Chote
2017-05-24 22:19:18 +01:00
committed by abcdefg30
parent e5222f95f6
commit 69587a2128
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -259,7 +259,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="FileSystem\Folder.cs" />
<Compile Include="FileSystem\InstallShieldPackage.cs" />
<Compile Include="FileSystem\ZipFile.cs" />
<Compile Include="Map\PlayerReference.cs" />
<Compile Include="Map\TileReference.cs" />
@@ -268,7 +267,6 @@
<Compile Include="FieldSaver.cs" />
<Compile Include="Manifest.cs" />
<Compile Include="Graphics\Vertex.cs" />
<Compile Include="FileFormats\Blast.cs" />
<Compile Include="FileFormats\HvaReader.cs" />
<Compile Include="FileFormats\PngLoader.cs" />
<Compile Include="FileFormats\VxlReader.cs" />

2
OpenRA.Game/FileFormats/Blast.cs → OpenRA.Mods.Common/FileFormats/Blast.cs
View File

@@ -15,7 +15,7 @@
using System;
using System.IO;
namespace OpenRA.FileFormats
namespace OpenRA.Mods.Common.FileFormats
{
public static class Blast
{

11
OpenRA.Game/FileSystem/InstallShieldPackage.cs → OpenRA.Mods.Common/FileSystem/InstallShieldPackage.cs
View File

@@ -9,12 +9,13 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.IO;
using OpenRA.FileFormats;
using OpenRA.FileSystem;
using OpenRA.Mods.Common.FileFormats;
using FS = OpenRA.FileSystem.FileSystem;
namespace OpenRA.FileSystem
namespace OpenRA.Mods.Common.FileSystem
{
public class InstallShieldLoader : IPackageLoader
{
@@ -121,7 +122,7 @@ namespace OpenRA.FileSystem
return ret;
}
public IReadOnlyPackage OpenPackage(string filename, FileSystem context)
public IReadOnlyPackage OpenPackage(string filename, FS context)
{
// Not implemented
return null;
@@ -140,7 +141,7 @@ namespace OpenRA.FileSystem
}
}
bool IPackageLoader.TryParsePackage(Stream s, string filename, FileSystem context, out IReadOnlyPackage package)
bool IPackageLoader.TryParsePackage(Stream s, string filename, FS context, out IReadOnlyPackage package)
{
// Take a peek at the file signature
var signature = s.ReadUInt32();

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -807,6 +807,8 @@
<Compile Include="Traits\Conditions\LineBuildSegmentExternalCondition.cs" />
<Compile Include="Traits\EntersTunnels.cs" />
<Compile Include="Traits\TunnelEntrance.cs" />
<Compile Include="FileSystem\InstallShieldPackage.cs" />
<Compile Include="FileFormats\Blast.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AfterBuild">

2
OpenRA.Mods.Common/UtilityCommands/ListInstallShieldContentsCommand.cs
View File

@@ -11,7 +11,7 @@
using System;
using System.IO;
using OpenRA.FileSystem;
using OpenRA.Mods.Common.FileSystem;
namespace OpenRA.Mods.Common.UtilityCommands
{