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

remove other param spam from CheckFire

Browse Source
This commit is contained in:
Chris Forbes
2010-07-31 15:34:12 +12:00
parent 2bd9cd32f6
commit 2ac261c15b
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.RA/AttackBase.cs
View File

@@ -143,13 +143,13 @@ namespace OpenRA.Mods.RA
var info = self.Info.Traits.Get<AttackBaseInfo>(); var info = self.Info.Traits.Get<AttackBaseInfo>();
foreach (var w in Weapons) foreach (var w in Weapons)
if (CheckFire(self, unit, w, ref w.FireDelay, w.Offset, ref w.Burst)) if (CheckFire(self, unit, w))
w.Recoil = 1; w.Recoil = 1;
} }
bool CheckFire(Actor self, Unit unit, Weapon w, ref int fireDelay, int[] offset, ref int burst) bool CheckFire(Actor self, Unit unit, Weapon w)
{ {
if (fireDelay > 0) return false; if (w.FireDelay > 0) return false;
var limitedAmmo = self.traits.GetOrDefault<LimitedAmmo>(); var limitedAmmo = self.traits.GetOrDefault<LimitedAmmo>();
if (limitedAmmo != null && !limitedAmmo.HasAmmo()) if (limitedAmmo != null && !limitedAmmo.HasAmmo())
@@ -160,20 +160,20 @@ namespace OpenRA.Mods.RA
if (!Combat.WeaponValidForTarget(w.Info, target)) return false; if (!Combat.WeaponValidForTarget(w.Info, target)) return false;
var barrel = w.Barrels[burst % w.Barrels.Length]; var barrel = w.Barrels[w.Burst % w.Barrels.Length];
var fireOffset = new[] { var fireOffset = new[] {
offset.ElementAtOrDefault(0) + barrel.Position.X, w.Offset.ElementAtOrDefault(0) + barrel.Position.X,
offset.ElementAtOrDefault(1) + barrel.Position.Y, w.Offset.ElementAtOrDefault(1) + barrel.Position.Y,
offset.ElementAtOrDefault(2), w.Offset.ElementAtOrDefault(2),
offset.ElementAtOrDefault(3) }; w.Offset.ElementAtOrDefault(3) };
if (--burst > 0) if (--w.Burst > 0)
fireDelay = w.Info.BurstDelay; w.FireDelay = w.Info.BurstDelay;
else else
{ {
fireDelay = w.Info.ROF; w.FireDelay = w.Info.ROF;
burst = w.Info.Burst; w.Burst = w.Info.Burst;
} }
var destUnit = target.IsActor ? target.Actor.traits.GetOrDefault<Unit>() : null; var destUnit = target.IsActor ? target.Actor.traits.GetOrDefault<Unit>() : null;