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

Add AttackMove workaround for Aircraft.

Browse Source
This commit is contained in:
Paul Chote
2019-01-22 00:01:51 +00:00
parent 60fcf5951c
commit 70f4c51a17
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -174,6 +174,7 @@ namespace OpenRA.Mods.Common.Traits
RepairableInfo repairableInfo; RepairableInfo repairableInfo;
RearmableInfo rearmableInfo; RearmableInfo rearmableInfo;
AttackMove attackMove;
ConditionManager conditionManager; ConditionManager conditionManager;
IDisposable reservation; IDisposable reservation;
IEnumerable<int> speedModifiers; IEnumerable<int> speedModifiers;
@@ -231,6 +232,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
repairableInfo = self.Info.TraitInfoOrDefault<RepairableInfo>(); repairableInfo = self.Info.TraitInfoOrDefault<RepairableInfo>();
rearmableInfo = self.Info.TraitInfoOrDefault<RearmableInfo>(); rearmableInfo = self.Info.TraitInfoOrDefault<RearmableInfo>();
attackMove = self.TraitOrDefault<AttackMove>();
conditionManager = self.TraitOrDefault<ConditionManager>(); conditionManager = self.TraitOrDefault<ConditionManager>();
speedModifiers = self.TraitsImplementing<ISpeedModifier>().ToArray().Select(sm => sm.GetSpeedModifier()); speedModifiers = self.TraitsImplementing<ISpeedModifier>().ToArray().Select(sm => sm.GetSpeedModifier());
cachedPosition = self.CenterPosition; cachedPosition = self.CenterPosition;
@@ -522,7 +524,12 @@ namespace OpenRA.Mods.Common.Traits
void INotifyBecomingIdle.OnBecomingIdle(Actor self) void INotifyBecomingIdle.OnBecomingIdle(Actor self)
{ {
OnBecomingIdle(self); // HACK: Work around AttackMove relying on INotifyIdle.TickIdle to continue its path
// AttackMoveActivity needs to be rewritten to use child activities instead!
if (attackMove != null && attackMove.TargetLocation.HasValue)
((INotifyIdle)attackMove).TickIdle(self);
else
OnBecomingIdle(self);
} }
protected virtual void OnBecomingIdle(Actor self) protected virtual void OnBecomingIdle(Actor self)