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

Make all Attack* traits listen to Stop order

Browse Source
This commit is contained in:
reaperrr
2016-06-10 23:27:22 +02:00
parent c153277e8b
commit c8012baffb
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -145,6 +145,9 @@ namespace OpenRA.Mods.Common.Traits
self.SetTargetLine(target, Color.Red); self.SetTargetLine(target, Color.Red);
AttackTarget(target, order.Queued, true, forceAttack); AttackTarget(target, order.Queued, true, forceAttack);
} }
if (order.OrderString == "Stop")
self.CancelActivity();
} }
static Target TargetFromOrder(Actor self, Order order) static Target TargetFromOrder(Actor self, Order order)

8
OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs
View File

@@ -77,14 +77,6 @@ namespace OpenRA.Mods.Common.Traits
return new ChargeAttack(this, newTarget); return new ChargeAttack(this, newTarget);
} }
public override void ResolveOrder(Actor self, Order order)
{
base.ResolveOrder(self, order);
if (order.OrderString == "Stop")
self.CancelActivity();
}
class ChargeAttack : Activity class ChargeAttack : Activity
{ {
readonly AttackCharge attack; readonly AttackCharge attack;