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

More HashSet trait fields & Lint support

Browse Source
This commit is contained in:
atlimit8
2015-09-05 15:54:00 -05:00
parent e74c0d6c13
commit 8250f223c4
57 changed files with 115 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromCDLogic.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (path != null)
Install(path);
else if ((installData.InstallShieldCABFileIds.Length != 0 || installData.InstallShieldCABFilePackageIds.Length != 0)
else if ((installData.InstallShieldCABFileIds.Count != 0 || installData.InstallShieldCABFilePackageIds.Count != 0)
&& (path = InstallUtils.GetMountedDisk(IsTFD)) != null)
InstallTFD(Platform.ResolvePath(path, "data1.hdr"));
else
@@ -91,10 +91,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
using (var cabExtractor = new InstallShieldCABExtractor(source))
{
var denom = installData.InstallShieldCABFileIds.Length;
var denom = installData.InstallShieldCABFileIds.Count;
var extractFiles = installData.ExtractFilesFromCD;
if (installData.InstallShieldCABFilePackageIds.Length > 0)
if (installData.InstallShieldCABFilePackageIds.Count > 0)
denom += extractFiles.SelectMany(x => x.Value).Count();
var installPercent = 100 / denom;