Merge pull request #6753 from pchote/ingame-menu-cleanup

Ingame menu cleanup
This commit is contained in:
Matthias Mailänder
2014-10-18 12:52:17 +02:00
18 changed files with 316 additions and 279 deletions

View File

@@ -31,6 +31,10 @@ namespace OpenRA.Mods.RA.Widgets
{
this.orderManager = orderManager;
var mpe = world.WorldActor.TraitOrDefault<MenuPaletteEffect>();
if (mpe != null)
mpe.Fade(mpe.Info.MenuEffect);
widget.Get<LabelWidget>("VERSION_LABEL").Text = Game.modData.Manifest.Mod.Version;
var showStats = false;
@@ -95,7 +99,6 @@ namespace OpenRA.Mods.RA.Widgets
leaveButton.OnClick = () =>
{
leaveButton.Disabled = true;
var mpe = world.WorldActor.TraitOrDefault<MenuPaletteEffect>();
Sound.PlayNotification(world.Map.Rules, null, "Speech", "Leave",
world.LocalPlayer == null ? null : world.LocalPlayer.Country.Race);