fixed.
This commit is contained in:
@@ -35,6 +35,7 @@ namespace OpenRA.FileFormats
|
||||
public static void Load(object self, MiniYaml my)
|
||||
{
|
||||
foreach (var x in my.Nodes)
|
||||
if (!x.Key.StartsWith("-"))
|
||||
LoadField( self, x.Key, x.Value.Value );
|
||||
}
|
||||
|
||||
|
||||
@@ -113,9 +113,10 @@ namespace OpenRA.FileFormats
|
||||
a.TryGetValue( key, out aa );
|
||||
b.TryGetValue( key, out bb );
|
||||
|
||||
if( key.Length > 0 && key[ 0 ] == '-' )
|
||||
continue;
|
||||
else if( noInherit.Contains( key ) )
|
||||
// if( key.Length > 0 && key[ 0 ] == '-' )
|
||||
// continue;
|
||||
// else
|
||||
if( noInherit.Contains( key ) )
|
||||
{
|
||||
if( aa != null )
|
||||
ret.Add( key, aa );
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace OpenRA.GameRules
|
||||
Category = categoryNode.Value;
|
||||
|
||||
foreach( var t in mergedNode )
|
||||
if( t.Key != "Inherits" && t.Key != "Category" )
|
||||
if( t.Key != "Inherits" && t.Key != "Category" && !t.Key.StartsWith("-") )
|
||||
Traits.Add( LoadTraitInfo( t.Key, t.Value ) );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user