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

Add support for multiple logic objects on a widget.

Browse Source
This commit is contained in:
Paul Chote
2015-02-22 15:22:55 +00:00
parent 1b31001661
commit f4987f7258
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Widgets/Widget.cs
View File

@@ -143,8 +143,8 @@ namespace OpenRA.Widgets
public string Y = "0"; public string Y = "0";
public string Width = "0"; public string Width = "0";
public string Height = "0"; public string Height = "0";
public string Logic = null; public string[] Logic = { };
public object LogicObject { get; private set; } public object[] LogicObjects { get; private set; }
public bool Visible = true; public bool Visible = true;
public bool IgnoreMouseOver; public bool IgnoreMouseOver;
public bool IgnoreChildMouseOver; public bool IgnoreChildMouseOver;
@@ -232,12 +232,13 @@ namespace OpenRA.Widgets
public void PostInit(WidgetArgs args) public void PostInit(WidgetArgs args)
{ {
if (Logic == null) if (!Logic.Any())
return; return;
args["widget"] = this; args["widget"] = this;
LogicObject = Game.ModData.ObjectCreator.CreateObject<object>(Logic, args); LogicObjects = Logic.Select(l => Game.ModData.ObjectCreator.CreateObject<object>(l, args))
.ToArray();
args.Remove("widget"); args.Remove("widget");
} }