Fix attack behaviour of disabled units.

OpenRA · Mar 30, 2019 · 522dad3 · 522dad3
1 parent 19977bb
commit 522dad3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/OpenRA.Mods.Common/Activities/Attack.cs b/OpenRA.Mods.Common/Activities/Attack.cs
@@ -10,6 +10,7 @@
 #endregion
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
@@ -200,8 +201,16 @@ protected virtual AttackStatus TickAttack(Actor self, AttackFrontal attack)
 			}
 
 			attackStatus |= AttackStatus.Attacking;
-			attack.DoAttack(self, target, armaments);
+			DoAttack(self, attack, armaments);
+
 			return AttackStatus.Attacking;
 		}
+
+		protected virtual void DoAttack(Actor self, AttackFrontal attack, IEnumerable<Armament> armaments)
+		{
+			if (!attack.IsTraitPaused)
+				foreach (var a in armaments)
+					a.CheckFire(self, facing, target);
+		}
 	}
 }
diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
@@ -122,12 +122,12 @@ protected virtual bool CanAttack(Actor self, Target target)
 			return true;
 		}
 
-		public virtual void DoAttack(Actor self, Target target, IEnumerable<Armament> armaments = null)
+		public virtual void DoAttack(Actor self, Target target)
 		{
-			if (armaments == null && !CanAttack(self, target))
+			if (!CanAttack(self, target))
 				return;
 
-			foreach (var a in armaments ?? Armaments)
+			foreach (var a in Armaments)
 				a.CheckFire(self, facing, target);
 		}
 
@@ -350,7 +350,7 @@ public IEnumerable<Armament> ChooseArmamentsForTarget(Target t, bool forceAttack
 
 		public void AttackTarget(Target target, bool queued, bool allowMove, bool forceAttack = false)
 		{
-			if (IsTraitDisabled || IsTraitPaused)
+			if (IsTraitDisabled)
 				return;
 
 			if (!target.IsValidFor(self))

diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackGarrisoned.cs b/OpenRA.Mods.Common/Traits/Attack/AttackGarrisoned.cs
@@ -142,7 +142,7 @@ WVec PortOffset(Actor self, FirePort p)
 			return coords.Value.LocalToWorld(p.Offset.Rotate(bodyOrientation));
 		}
 
-		public override void DoAttack(Actor self, Target target, IEnumerable<Armament> armaments = null)
+		public override void DoAttack(Actor self, Target target)
 		{
 			if (!CanAttack(self, target))
 				return;

diff --git a/OpenRA.Mods.D2k/Traits/AttackSwallow.cs b/OpenRA.Mods.D2k/Traits/AttackSwallow.cs
@@ -50,7 +50,7 @@ public AttackSwallow(Actor self, AttackSwallowInfo info)
 			Info = info;
 		}
 
-		public override void DoAttack(Actor self, Target target, IEnumerable<Armament> armaments = null)
+		public override void DoAttack(Actor self, Target target)
 		{
 			// This is so that the worm does not launch an attack against a target that has reached solid rock
 			if (target.Type != TargetType.Actor || !CanAttack(self, target))
@@ -86,6 +86,11 @@ protected override Target RecalculateTarget(Actor self, out bool targetIsHiddenA
 				targetIsHiddenActor = false;
 				return target;
 			}
+
+			protected override void DoAttack(Actor self, AttackFrontal attack, IEnumerable<Armament> armaments)
+			{
+				attack.DoAttack(self, target);
+			}
 		}
 	}
 }