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

Centralize weapon validity check into WeaponInfo.

Browse Source
This commit is contained in:
Paul Chote
2013-07-07 10:48:29 +12:00
parent 4b1323ada5
commit 87361df043
4 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Armament.cs
View File

@@ -116,7 +116,7 @@ namespace OpenRA.Mods.RA
if (target.IsInRange(self.CenterPosition, minRange))
return;
if (!IsValidAgainst(self.World, target))
if (!Weapon.IsValidAgainst(target, self.World))
return;
var barrel = Barrels[Burst % Barrels.Length];
@@ -172,14 +172,6 @@ namespace OpenRA.Mods.RA
}
}
public bool IsValidAgainst(World world, Target target)
{
if (target.IsActor)
return Combat.WeaponValidForTarget(Weapon, target.Actor);
else
return Combat.WeaponValidForTarget(Weapon, world, target.CenterPosition.ToCPos());
}
public bool IsReloading { get { return FireDelay > 0; } }
public WVec MuzzleOffset(Actor self, Barrel b)