From e9e8c3fe49f7062af6fae62839252be51534ffc6 Mon Sep 17 00:00:00 2001 From: Dan9550 <56kflyingtoaster@gmail.com> Date: Sat, 28 Sep 2013 19:38:33 +1000 Subject: [PATCH] Basic Tiberian Sun install logic --- OpenRA.Mods.TS/Widgets/Logic/TSInstallFromCDLogic.cs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/OpenRA.Mods.TS/Widgets/Logic/TSInstallFromCDLogic.cs b/OpenRA.Mods.TS/Widgets/Logic/TSInstallFromCDLogic.cs index 642640ad89..aaa96f4a79 100755 --- a/OpenRA.Mods.TS/Widgets/Logic/TSInstallFromCDLogic.cs +++ b/OpenRA.Mods.TS/Widgets/Logic/TSInstallFromCDLogic.cs @@ -72,14 +72,8 @@ namespace OpenRA.Mods.TS.Widgets.Logic var dest = new string[] { Platform.SupportDir, "Content", "ts" }.Aggregate(Path.Combine); var copyFiles = new string[] { "install/tibsun.mix", "scores.mix", "multi.mix"}; - //tibsun.mix needs to be decrypted to be extracted - var extractPackage = "tibsun.mix"; - var extractFiles = new string[] { "sidenc01.mix", "sidenc02.mix", "cache.mix", "conquer.mix", - "isosnow.mix", "isotemp.mix", "local.mix", "sidec01.mix", "sidec02.mix", "sno.mix", - "snow.mix", "sounds.mix", "speech01.mix", "speech02.mix", "tem.mix", "temperat.mix"}; - var installCounter = 0; - var installTotal = copyFiles.Count() + extractFiles.Count(); + var installTotal = copyFiles.Count(); var onProgress = (Action)(s => Game.RunAfterTick(() => { progressBar.Percentage = installCounter*100/installTotal; @@ -102,9 +96,6 @@ namespace OpenRA.Mods.TS.Widgets.Logic if (!InstallUtils.CopyFiles(source, copyFiles, dest, onProgress, onError)) return; - if (!InstallUtils.ExtractFromPackage(source, extractPackage, extractFiles, dest, onProgress, onError)) - return; - Game.RunAfterTick(() => { Ui.CloseWindow();