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

View File

@@ -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 );