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

Cache traits implementing INotifyAttack

Browse Source
This commit is contained in:
reaperrr
2017-06-18 22:44:18 +02:00
committed by atlimit8
parent 779218f381
commit 8e9f20cf4b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Armament.cs
View File

@@ -108,6 +108,7 @@ namespace OpenRA.Mods.Common.Traits
AmmoPool ammoPool; AmmoPool ammoPool;
BodyOrientation coords; BodyOrientation coords;
INotifyBurstComplete[] notifyBurstComplete; INotifyBurstComplete[] notifyBurstComplete;
INotifyAttack[] notifyAttacks;
IEnumerable<int> rangeModifiers; IEnumerable<int> rangeModifiers;
IEnumerable<int> reloadModifiers; IEnumerable<int> reloadModifiers;
@@ -156,6 +157,7 @@ namespace OpenRA.Mods.Common.Traits
ammoPool = self.TraitsImplementing<AmmoPool>().FirstOrDefault(la => la.Info.Name == Info.AmmoPoolName); ammoPool = self.TraitsImplementing<AmmoPool>().FirstOrDefault(la => la.Info.Name == Info.AmmoPoolName);
coords = self.Trait<BodyOrientation>(); coords = self.Trait<BodyOrientation>();
notifyBurstComplete = self.TraitsImplementing<INotifyBurstComplete>().ToArray(); notifyBurstComplete = self.TraitsImplementing<INotifyBurstComplete>().ToArray();
notifyAttacks = self.TraitsImplementing<INotifyAttack>().ToArray();
rangeModifiers = self.TraitsImplementing<IRangeModifier>().ToArray().Select(m => m.GetRangeModifier()); rangeModifiers = self.TraitsImplementing<IRangeModifier>().ToArray().Select(m => m.GetRangeModifier());
reloadModifiers = self.TraitsImplementing<IReloadModifier>().ToArray().Select(m => m.GetReloadModifier()); reloadModifiers = self.TraitsImplementing<IReloadModifier>().ToArray().Select(m => m.GetReloadModifier());
@@ -248,7 +250,7 @@ namespace OpenRA.Mods.Common.Traits
GuidedTarget = target GuidedTarget = target
}; };
foreach (var na in self.TraitsImplementing<INotifyAttack>()) foreach (var na in notifyAttacks)
na.PreparingAttack(self, target, this, barrel); na.PreparingAttack(self, target, this, barrel);
ScheduleDelayedAction(Info.FireDelay, () => ScheduleDelayedAction(Info.FireDelay, () =>
@@ -265,7 +267,7 @@ namespace OpenRA.Mods.Common.Traits
if (Burst == args.Weapon.Burst && args.Weapon.StartBurstReport != null && args.Weapon.StartBurstReport.Any()) if (Burst == args.Weapon.Burst && args.Weapon.StartBurstReport != null && args.Weapon.StartBurstReport.Any())
Game.Sound.Play(SoundType.World, args.Weapon.StartBurstReport.Random(self.World.SharedRandom), self.CenterPosition); Game.Sound.Play(SoundType.World, args.Weapon.StartBurstReport.Random(self.World.SharedRandom), self.CenterPosition);
foreach (var na in self.TraitsImplementing<INotifyAttack>()) foreach (var na in notifyAttacks)
na.Attacking(self, target, this, barrel); na.Attacking(self, target, this, barrel);
Recoil = Info.Recoil; Recoil = Info.Recoil;