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

change NewUnitInfo to use a TypeDictionary

Browse Source
This commit is contained in:
Chris Forbes
2010-01-10 14:29:26 +13:00
parent be9fd1e277
commit 9add15464c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRa.Game/Actor.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRa.Game
if( Info.Traits == null )
throw new InvalidOperationException( "No Actor traits for {0}; add Traits= to units.ini for appropriate unit".F(Info.Name) );
foreach (var trait in Rules.NewUnitInfo[Info.Name.ToLower()].Traits.Values)
foreach (var trait in Rules.NewUnitInfo[Info.Name.ToLower()].Traits.WithInterface<ITraitInfo>())
traits.Add(trait.Create(this));
}

7
OpenRa.Game/GameRules/NewUnitInfo.cs
View File

@@ -9,7 +9,7 @@ namespace OpenRa.Game.GameRules
class NewUnitInfo
{
public readonly string Parent;
public readonly Dictionary<string, ITraitInfo> Traits;
public readonly TypeDictionary Traits = new TypeDictionary();
public NewUnitInfo( MiniYaml node )
{
@@ -20,9 +20,8 @@ namespace OpenRa.Game.GameRules
node.Nodes.Remove( "Inherits" );
}
Traits = node.Nodes.ToDictionary(
a => a.Key,
a => LoadTraitInfo( a.Key, a.Value ));
foreach (var t in node.Nodes)
Traits.Add(LoadTraitInfo(t.Key, t.Value));
}
static ITraitInfo LoadTraitInfo(string traitName, MiniYaml my)