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

Improve error message for children of removals.

Browse Source
This commit is contained in:
Paul Chote
2018-11-03 12:40:54 +00:00
committed by abcdefg30
parent f05e3e871f
commit 81d53a4f1a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Lint/CheckUnknownTraitFields.cs
View File

@@ -37,18 +37,19 @@ namespace OpenRA.Mods.Common.Lint
// Removals can never define children // Removals can never define children
if (t.Key.StartsWith("-", StringComparison.Ordinal) && t.Value.Nodes.Any()) if (t.Key.StartsWith("-", StringComparison.Ordinal) && t.Value.Nodes.Any())
{ {
emitError("{0} has child nodes, which is not valid for removals.".F(t.Key)); emitError("{0} defines child nodes, which are not valid for removals.".F(t.Location));
continue; continue;
} }
var traitName = NormalizeName(t.Key);
// Inherits can never define children // Inherits can never define children
if (NormalizeName(t.Key) == "Inherits" && t.Value.Nodes.Any()) if (traitName == "Inherits" && t.Value.Nodes.Any())
{ {
emitError("{0} defines child nodes, which are not valid for Inherits.".F(t.Location)); emitError("{0} defines child nodes, which are not valid for Inherits.".F(t.Location));
continue; continue;
} }
var traitName = NormalizeName(t.Key);
var traitInfo = modData.ObjectCreator.FindType(traitName + "Info"); var traitInfo = modData.ObjectCreator.FindType(traitName + "Info");
foreach (var field in t.Value.Nodes) foreach (var field in t.Value.Nodes)
{ {