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

Minor style fixes.

Browse Source
This commit is contained in:
Paul Chote
2014-09-29 20:58:09 +13:00
parent f463407d8d
commit 7bc8c171e8
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Game/GameRules/WeaponInfo.cs
View File

@@ -62,6 +62,7 @@ namespace OpenRA.GameRules
[FieldLoader.LoadUsing("LoadProjectile")] [FieldLoader.LoadUsing("LoadProjectile")]
public readonly IProjectileInfo Projectile; public readonly IProjectileInfo Projectile;
[FieldLoader.LoadUsing("LoadWarheads")] [FieldLoader.LoadUsing("LoadWarheads")]
public readonly List<Warhead> Warheads = new List<Warhead>(); public readonly List<Warhead> Warheads = new List<Warhead>();
@@ -93,7 +94,7 @@ namespace OpenRA.GameRules
return retList; return retList;
} }
///<summary>Checks if the weapon is valid against (can target) the target.</summary> /// <summary>Checks if the weapon is valid against (can target) the target.</summary>
public bool IsValidAgainst(Target target, World world, Actor firedBy) public bool IsValidAgainst(Target target, World world, Actor firedBy)
{ {
if (target.Type == TargetType.Actor) if (target.Type == TargetType.Actor)
@@ -119,7 +120,7 @@ namespace OpenRA.GameRules
return false; return false;
} }
///<summary>Checks if the weapon is valid against (can target) the actor.</summary> /// <summary>Checks if the weapon is valid against (can target) the actor.</summary>
public bool IsValidAgainst(Actor victim, Actor firedBy) public bool IsValidAgainst(Actor victim, Actor firedBy)
{ {
var targetable = victim.TraitOrDefault<ITargetable>(); var targetable = victim.TraitOrDefault<ITargetable>();
@@ -133,7 +134,7 @@ namespace OpenRA.GameRules
return true; return true;
} }
///<summary>Checks if the weapon is valid against (can target) the frozen actor.</summary> /// <summary>Checks if the weapon is valid against (can target) the frozen actor.</summary>
public bool IsValidAgainst(FrozenActor victim, Actor firedBy) public bool IsValidAgainst(FrozenActor victim, Actor firedBy)
{ {
var targetable = victim.Info.Traits.GetOrDefault<ITargetableInfo>(); var targetable = victim.Info.Traits.GetOrDefault<ITargetableInfo>();
@@ -147,18 +148,16 @@ namespace OpenRA.GameRules
return true; return true;
} }
///<summary>Applies all the weapon's warheads to the target.</summary> /// <summary>Applies all the weapon's warheads to the target.</summary>
public void Impact(Target target, Actor firedBy, IEnumerable<int> damageModifiers) public void Impact(Target target, Actor firedBy, IEnumerable<int> damageModifiers)
{ {
foreach (var warhead in Warheads) foreach (var warhead in Warheads)
{ {
var wh = warhead; // force the closure to bind to the current warhead var wh = warhead; // force the closure to bind to the current warhead
Action a;
a = () => wh.DoImpact(target, firedBy, damageModifiers); Action a = () => wh.DoImpact(target, firedBy, damageModifiers);
if (wh.Delay > 0) if (wh.Delay > 0)
firedBy.World.AddFrameEndTask( firedBy.World.AddFrameEndTask(w => w.Add(new DelayedAction(wh.Delay, a)));
w => w.Add(new DelayedAction(wh.Delay, a)));
else else
a(); a();
} }