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

prep in pathfinder for multi-source pathing

Browse Source
This commit is contained in:
Chris Forbes
2009-10-22 22:34:06 +13:00
parent 4382a10568
commit 1effd85d50
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRa.Game/Actor.cs
View File

@@ -33,12 +33,13 @@ namespace OpenRa.Game
foreach( var traitName in unitInfo.Traits )
{
var type = typeof( Traits.Mobile ).Assembly.GetType( typeof( Traits.Mobile ).Namespace + "." + traitName, true, false );
var ctor = type.GetConstructor( new Type[] { typeof( Actor ) } );
var ctor = type.GetConstructor( new[] { typeof( Actor ) } );
traits.Add( type, ctor.Invoke( new object[] { this } ) );
}
}
else
throw new InvalidOperationException( "No Actor traits for " + unitInfo.Name + "; add Traits= to units.ini for appropriate unit" );
throw new InvalidOperationException( "No Actor traits for " + unitInfo.Name
+ "; add Traits= to units.ini for appropriate unit" );
}
public Actor( TreeReference tree, TreeCache treeRenderer, int2 mapOffset )
@@ -65,8 +66,7 @@ namespace OpenRa.Game
{
return traits.WithInterface<Traits.IOrder>()
.Select( x => x.Order( this, xy ) )
.Where( x => x != null )
.FirstOrDefault();
.FirstOrDefault( x => x != null );
}
public RectangleF Bounds
@@ -83,9 +83,9 @@ namespace OpenRa.Game
{
/* todo: auto-retaliate, etc */
/* todo: death sequence for infantry based on inflictor */
/* todo: start smoking if < conditionYellow and took damage, and not already smoking
/* todo: start smoking if < conditionYellow and took damage, and not already smoking */
if (Health <= 0) return; /* overkill! */
if (Health <= 0) return; /* overkill! don't count extra hits as more kills! */
Health -= damage;
if (Health <= 0)