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

disable menu buttons when script errors occur

Browse Source
This commit is contained in:
Matthias Mailänder
2015-08-06 09:16:35 +02:00
parent f1b9b31f07
commit d4a0bfe2a5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs
View File

@@ -11,6 +11,7 @@
using System; using System;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Scripting;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Widgets; using OpenRA.Widgets;
@@ -35,6 +36,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var hideMenu = false; var hideMenu = false;
menu.Get("MENU_BUTTONS").IsVisible = () => !hideMenu; menu.Get("MENU_BUTTONS").IsVisible = () => !hideMenu;
var scriptContext = world.WorldActor.TraitOrDefault<LuaScript>();
var hasError = scriptContext != null && scriptContext.FatalErrorOccurred;
// TODO: Create a mechanism to do things like this cleaner. Also needed for scripted missions // TODO: Create a mechanism to do things like this cleaner. Also needed for scripted missions
Action onQuit = () => Action onQuit = () =>
{ {
@@ -102,7 +106,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}; };
var surrenderButton = menu.Get<ButtonWidget>("SURRENDER"); var surrenderButton = menu.Get<ButtonWidget>("SURRENDER");
surrenderButton.IsVisible = () => world.Type == WorldType.Regular; surrenderButton.IsVisible = () => world.Type == WorldType.Regular;
surrenderButton.IsDisabled = () => (world.LocalPlayer == null || world.LocalPlayer.WinState != WinState.Undefined); surrenderButton.IsDisabled = () => (world.LocalPlayer == null || world.LocalPlayer.WinState != WinState.Undefined) || hasError;
surrenderButton.OnClick = () => surrenderButton.OnClick = () =>
{ {
hideMenu = true; hideMenu = true;