Let FieldLoader do the hard work of loading fields.

This commit is contained in:
Paul Chote
2014-06-29 11:41:28 +12:00
committed by Matthias Mailänder
parent 352067eb48
commit 3f7293b206
12 changed files with 46 additions and 42 deletions

View File

@@ -21,17 +21,17 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{
public class DownloadPackagesLogic
{
Widget panel;
IReadOnlyDictionary<string, string> installData;
ProgressBarWidget progressBar;
LabelWidget statusLabel;
Action afterInstall;
readonly Widget panel;
readonly InstallData installData;
readonly ProgressBarWidget progressBar;
readonly LabelWidget statusLabel;
readonly Action afterInstall;
string mirror;
[ObjectCreator.UseCtor]
public DownloadPackagesLogic(Widget widget, IReadOnlyDictionary<string, string> installData, Action afterInstall)
public DownloadPackagesLogic(Widget widget, Action afterInstall)
{
this.installData = installData;
installData = Game.modData.Manifest.ContentInstaller;
this.afterInstall = afterInstall;
panel = widget.Get("INSTALL_DOWNLOAD_PANEL");
@@ -130,7 +130,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
};
// Get the list of mirrors
var updateMirrors = new Download(installData["PackageMirrorList"], mirrorsFile, onDownloadProgress, onFetchMirrorsComplete);
var updateMirrors = new Download(installData.PackageMirrorList, mirrorsFile, onDownloadProgress, onFetchMirrorsComplete);
cancelButton.OnClick = () => { updateMirrors.Cancel(); Ui.CloseWindow(); };
retryButton.OnClick = () => { updateMirrors.Cancel(); ShowDownloadDialog(); };
}