From 57a631c284f06e6b32c4acf0ea11c6075dc6ec96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 28 Jun 2014 12:49:11 +0200 Subject: [PATCH] rebase bit rot crap --- OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs index a528aa0ed5..f7388bc234 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs @@ -20,11 +20,14 @@ namespace OpenRA.Mods.RA.Widgets.Logic public class InstallMusicLogic { ButtonWidget installButton; - Dictionary installData; + Ruleset modRules; + IReadOnlyDictionary installData; [ObjectCreator.UseCtor] - public InstallMusicLogic(Widget widget) + public InstallMusicLogic(Widget widget, Ruleset modRules) { + this.modRules = modRules; + installData = Game.modData.Manifest.ContentInstaller; installButton = widget.GetOrNull("INSTALL_BUTTON"); @@ -32,7 +35,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic { installButton.OnClick = () => LoadInstallMusicContainer(); installButton.IsVisible = () => - Rules.InstalledMusic.ToArray().Length <= Exts.ParseIntegerInvariant(installData["ShippedSoundtracks"]); + modRules.InstalledMusic.ToArray().Length <= Exts.ParseIntegerInvariant(installData["ShippedSoundtracks"]); } } @@ -45,7 +48,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic try { GlobalFileSystem.LoadFromManifest(Game.modData.Manifest); - Rules.Music.Do(m => m.Value.Reload()); + modRules.Music.Do(m => m.Value.Reload()); var musicPlayerLogic = (MusicPlayerLogic)installButton.Parent.LogicObject; musicPlayerLogic.BuildMusicTable(); Ui.CloseWindow();