diff --git a/OpenRA.FileFormats/FieldLoader.cs b/OpenRA.FileFormats/FieldLoader.cs index ab5557c539..65038a4880 100644 --- a/OpenRA.FileFormats/FieldLoader.cs +++ b/OpenRA.FileFormats/FieldLoader.cs @@ -35,7 +35,8 @@ namespace OpenRA.FileFormats public static void Load(object self, MiniYaml my) { foreach (var x in my.Nodes) - LoadField( self, x.Key, x.Value.Value ); + if (!x.Key.StartsWith("-")) + LoadField( self, x.Key, x.Value.Value ); } public static void LoadField( object self, string key, string value ) diff --git a/OpenRA.FileFormats/MiniYaml.cs b/OpenRA.FileFormats/MiniYaml.cs index 8376fe8146..2657350579 100755 --- a/OpenRA.FileFormats/MiniYaml.cs +++ b/OpenRA.FileFormats/MiniYaml.cs @@ -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 ); diff --git a/OpenRA.Game/GameRules/ActorInfo.cs b/OpenRA.Game/GameRules/ActorInfo.cs index 3141d3b383..8a7ab90de0 100644 --- a/OpenRA.Game/GameRules/ActorInfo.cs +++ b/OpenRA.Game/GameRules/ActorInfo.cs @@ -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 ) ); }