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

new actor wiring for NewUnitInfo

Browse Source
This commit is contained in:
Chris Forbes
2010-01-10 14:03:21 +13:00
parent 30bed96259
commit 79ce6b70b6
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRa.Game/Actor.cs
View File

@@ -23,16 +23,6 @@ namespace OpenRa.Game
public int Health; public int Health;
IActivity currentActivity; IActivity currentActivity;
object ConstructTrait(string traitName)
{
/* todo: allow mods to introduce traits */
var type = typeof(Mobile).Assembly.GetType(typeof(Mobile).Namespace + "." + traitName, true, false);
var ctor = type.GetConstructor(new[] { typeof(Actor) });
if (ctor == null)
throw new InvalidOperationException("Trait {0} does not have the correct constructor: {0}(Actor self)".F(type.Name));
return ctor.Invoke(new object[] { this });
}
public Actor( ActorInfo info, int2 location, Player owner ) public Actor( ActorInfo info, int2 location, Player owner )
{ {
ActorID = Game.world.NextAID(); ActorID = Game.world.NextAID();
@@ -48,11 +38,8 @@ namespace OpenRa.Game
if( Info.Traits == null ) if( Info.Traits == null )
throw new InvalidOperationException( "No Actor traits for {0}; add Traits= to units.ini for appropriate unit".F(Info.Name) ); throw new InvalidOperationException( "No Actor traits for {0}; add Traits= to units.ini for appropriate unit".F(Info.Name) );
//foreach (var traitName in Info.Traits) foreach (var trait in Rules.NewUnitInfo[Info.Name.ToLower()].Traits.Values)
// traits.Add(ConstructTrait(traitName)); traits.Add(trait.Create(this));
foreach( var traitName in Rules.NewUnitInfo[Info.Name.ToLower()].Traits.Keys )
traits.Add( ConstructTrait( traitName ) );
} }
public void Tick() public void Tick()