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

Merge pull request #8119 from penev92/bleed_d2kVideos

Browse Source 
Rework mod content installation directories and add D2k videos
This commit is contained in:
Matthias Mailänder
2015-06-16 18:37:50 +02:00
parent e1904274d8 6c75d1dde3
commit 96884210b3
9 changed files with 107 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -304,7 +304,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (!GlobalFileSystem.Exists(filename))
return false;
if (Path.GetExtension(filename).ToLower() == ".vqa")
if (Path.GetExtension(filename.ToLowerInvariant()) == ".vqa")
{
player = panel.Get<VqaPlayerWidget>("PLAYER");
currentFilename = filename;

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

@@ -80,8 +80,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var extractFiles = installData.ExtractFilesFromCD;
var overwrite = installData.OverwriteFiles;
var installCounter = 0;
var installTotal = copyFiles.Length + extractFiles.Length;
var installTotal = copyFiles.SelectMany(x => x.Value).Count() + extractFiles.SelectMany(x => x.Value).Count();
var onProgress = (Action<string>)(s => Game.RunAfterTick(() =>
{
progressBar.Percentage = installCounter * 100 / installTotal;
@@ -101,7 +102,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
try
{
if (!InstallUtils.CopyFiles(source, copyFiles, dest, onProgress, onError))
if (!InstallUtils.CopyFiles(source, copyFiles, dest, overwrite, onProgress, onError))
{
onError("Copying files from CD failed.");
return;
@@ -109,7 +110,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (!string.IsNullOrEmpty(extractPackage))
{
if (!InstallUtils.ExtractFromPackage(source, extractPackage, annotation, extractFiles, dest, onProgress, onError))
if (!InstallUtils.ExtractFromPackage(source, extractPackage, annotation, extractFiles, dest, overwrite, onProgress, onError))
{
onError("Extracting files from CD failed.");
return;