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

rebase bit rot crap

Browse Source
This commit is contained in:
Matthias Mailänder
2014-06-28 12:49:11 +02:00
parent 7783e988a7
commit 57a631c284
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs
View File

@@ -20,11 +20,14 @@ namespace OpenRA.Mods.RA.Widgets.Logic
public class InstallMusicLogic public class InstallMusicLogic
{ {
ButtonWidget installButton; ButtonWidget installButton;
Dictionary<string, string> installData; Ruleset modRules;
IReadOnlyDictionary<string, string> installData;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public InstallMusicLogic(Widget widget) public InstallMusicLogic(Widget widget, Ruleset modRules)
{ {
this.modRules = modRules;
installData = Game.modData.Manifest.ContentInstaller; installData = Game.modData.Manifest.ContentInstaller;
installButton = widget.GetOrNull<ButtonWidget>("INSTALL_BUTTON"); installButton = widget.GetOrNull<ButtonWidget>("INSTALL_BUTTON");
@@ -32,7 +35,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ {
installButton.OnClick = () => LoadInstallMusicContainer(); installButton.OnClick = () => LoadInstallMusicContainer();
installButton.IsVisible = () => 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 try
{ {
GlobalFileSystem.LoadFromManifest(Game.modData.Manifest); 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; var musicPlayerLogic = (MusicPlayerLogic)installButton.Parent.LogicObject;
musicPlayerLogic.BuildMusicTable(); musicPlayerLogic.BuildMusicTable();
Ui.CloseWindow(); Ui.CloseWindow();