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

Calling PreparingAttack before calculating Muzzle.

Browse Source
This commit is contained in:
Andre Mohren
2018-09-29 19:48:39 +02:00
committed by abcdefg30
parent abdb1f7547
commit 6cd1919cca
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,6 +275,9 @@ namespace OpenRA.Mods.Common.Traits
protected virtual void FireBarrel(Actor self, IFacing facing, Target target, Barrel barrel) protected virtual void FireBarrel(Actor self, IFacing facing, Target target, Barrel barrel)
{ {
foreach (var na in notifyAttacks)
na.PreparingAttack(self, target, this, barrel);
Func<WPos> muzzlePosition = () => self.CenterPosition + MuzzleOffset(self, barrel); Func<WPos> muzzlePosition = () => self.CenterPosition + MuzzleOffset(self, barrel);
var legacyFacing = MuzzleOrientation(self, barrel).Yaw.Angle / 4; var legacyFacing = MuzzleOrientation(self, barrel).Yaw.Angle / 4;
Func<int> legacyMuzzleFacing = () => MuzzleOrientation(self, barrel).Yaw.Angle / 4; Func<int> legacyMuzzleFacing = () => MuzzleOrientation(self, barrel).Yaw.Angle / 4;
@@ -315,9 +318,6 @@ namespace OpenRA.Mods.Common.Traits
GuidedTarget = target GuidedTarget = target
}; };
foreach (var na in notifyAttacks)
na.PreparingAttack(self, target, this, barrel);
ScheduleDelayedAction(Info.FireDelay, () => ScheduleDelayedAction(Info.FireDelay, () =>
{ {
if (args.Weapon.Projectile != null) if (args.Weapon.Projectile != null)