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

LoadWidget modRules Fix

Browse Source 
Fixes #6625
This commit is contained in:
steelphase
2014-09-29 23:07:48 -04:00
parent e9b76e516b
commit 3a5d04f824
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Widgets/WidgetLoader.cs
View File

@@ -45,6 +45,9 @@ namespace OpenRA
public Widget LoadWidget(WidgetArgs args, Widget parent, MiniYamlNode node) public Widget LoadWidget(WidgetArgs args, Widget parent, MiniYamlNode node)
{ {
if (!args.ContainsKey("modRules"))
args = new WidgetArgs(args) { { "modRules", modData.DefaultRules } };
var widget = NewWidget(node.Key, args); var widget = NewWidget(node.Key, args);
if (parent != null) if (parent != null)
@@ -57,8 +60,6 @@ namespace OpenRA
if (child.Key != "Children") if (child.Key != "Children")
FieldLoader.LoadField(widget, child.Key, child.Value.Value); FieldLoader.LoadField(widget, child.Key, child.Value.Value);
if (!args.ContainsKey("modRules"))
args = new WidgetArgs(args) { { "modRules", modData.DefaultRules } };
widget.Initialize(args); widget.Initialize(args);
foreach (var child in node.Value.Nodes) foreach (var child in node.Value.Nodes)