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

Merge pull request #6150 from Mailaender/disable-music-install-during-games

Browse Source 
Disabled music installation during matches
This commit is contained in:
obrakmann
2014-08-06 16:47:11 +02:00
parent 5627fad797 282b16e3fc
commit 42d8a9fe29
5 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs
View File

@@ -68,6 +68,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs() Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs()
{ {
{ "onExit", () => hideButtons = false }, { "onExit", () => hideButtons = false },
{ "world", world }
}); });
}; };

6
OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
View File

@@ -67,7 +67,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic
widget.Get<ButtonWidget>("MUSIC").OnClick = () => widget.Get<ButtonWidget>("MUSIC").OnClick = () =>
{ {
widget.Visible = false; widget.Visible = false;
Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs { { "onExit", () => { widget.Visible = true; } } }); Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs
{
{ "onExit", () => { widget.Visible = true; } },
{ "world", world }
});
}; };
var resumeButton = widget.Get<ButtonWidget>("RESUME"); var resumeButton = widget.Get<ButtonWidget>("RESUME");

6
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -511,7 +511,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var musicButton = lobby.GetOrNull<ButtonWidget>("MUSIC_BUTTON"); var musicButton = lobby.GetOrNull<ButtonWidget>("MUSIC_BUTTON");
if (musicButton != null) if (musicButton != null)
musicButton.OnClick = () => Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs { { "onExit", DoNothing } }); musicButton.OnClick = () => Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs
{
{ "onExit", DoNothing },
{ "world", orderManager.world }
});
var settingsButton = lobby.GetOrNull<ButtonWidget>("SETTINGS_BUTTON"); var settingsButton = lobby.GetOrNull<ButtonWidget>("SETTINGS_BUTTON");
if (settingsButton != null) if (settingsButton != null)

1
OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs
View File

@@ -111,6 +111,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs
{ {
{ "onExit", () => menuType = MenuType.Extras }, { "onExit", () => menuType = MenuType.Extras },
{ "world", world }
}); });
}; };

3
OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
ScrollItemWidget itemTemplate; ScrollItemWidget itemTemplate;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public MusicPlayerLogic(Widget widget, Ruleset modRules, Action onExit) public MusicPlayerLogic(Widget widget, Ruleset modRules, World world, Action onExit)
{ {
this.modRules = modRules; this.modRules = modRules;
@@ -84,6 +84,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var installButton = widget.GetOrNull<ButtonWidget>("INSTALL_BUTTON"); var installButton = widget.GetOrNull<ButtonWidget>("INSTALL_BUTTON");
if (installButton != null) if (installButton != null)
{ {
installButton.IsDisabled = () => !world.IsShellmap;
var args = new string[] { "Launch.Window=INSTALL_MUSIC_PANEL" }; var args = new string[] { "Launch.Window=INSTALL_MUSIC_PANEL" };
installButton.OnClick = () => installButton.OnClick = () =>
{ {