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

fixed.

Browse Source
This commit is contained in:
Chris Forbes
2010-03-19 20:07:58 +13:00
parent a3a62d2c14
commit 58041f1b45
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.FileFormats/FieldLoader.cs
View File

@@ -35,7 +35,8 @@ namespace OpenRA.FileFormats
public static void Load(object self, MiniYaml my) public static void Load(object self, MiniYaml my)
{ {
foreach (var x in my.Nodes) 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 ) public static void LoadField( object self, string key, string value )

7
OpenRA.FileFormats/MiniYaml.cs
View File

@@ -113,9 +113,10 @@ namespace OpenRA.FileFormats
a.TryGetValue( key, out aa ); a.TryGetValue( key, out aa );
b.TryGetValue( key, out bb ); b.TryGetValue( key, out bb );
if( key.Length > 0 && key[ 0 ] == '-' ) // if( key.Length > 0 && key[ 0 ] == '-' )
continue; // continue;
else if( noInherit.Contains( key ) ) // else
if( noInherit.Contains( key ) )
{ {
if( aa != null ) if( aa != null )
ret.Add( key, aa ); ret.Add( key, aa );

2
OpenRA.Game/GameRules/ActorInfo.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRA.GameRules
Category = categoryNode.Value; Category = categoryNode.Value;
foreach( var t in mergedNode ) 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 ) ); Traits.Add( LoadTraitInfo( t.Key, t.Value ) );
} }