tidy up disabled handling

OpenRA.Game/Traits/CreatesShroud.cs

@@ -29,7 +29,7 @@ namespace OpenRA.Traits
 
 		public void Tick(Actor self)
 		{
-			if (!self.TraitsImplementing<IDisable>().Any(d => d.Disabled))
+			if (!self.IsDisabled())
 				self.World.WorldActor.Trait<Shroud>().HideActor(self, Info.Range);
 		}
 	}

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
@@ -224,4 +225,12 @@ namespace OpenRA.Traits
 	public interface ILintPass { void Run(Action<string> emitError, Action<string> emitWarning); }
 
 	public interface IObjectivesPanel { string ObjectivesPanel { get; } }
+
+	public static class DisableExts
+	{
+		public static bool IsDisabled(this Actor a)
+		{
+			return a.TraitsImplementing<IDisable>().Any(d => d.Disabled);
+		}
+	}
 }

OpenRA.Mods.RA/Attack/AttackBase.cs

@@ -81,7 +81,7 @@ namespace OpenRA.Mods.RA
 		{
 			if (!target.IsValid) return false;
 			if (Weapons.All(w => w.IsReloading)) return false;
-			if (self.TraitsImplementing<IDisable>().Any(d => d.Disabled)) return false;
+			if (self.IsDisabled()) return false;
 
 			if (target.IsActor && target.Actor.HasTrait<ITargetable>() &&
 				!target.Actor.Trait<ITargetable>().TargetableBy(target.Actor,self))

OpenRA.Mods.RA/Attack/AttackTurreted.cs

@@ -81,8 +81,7 @@ namespace OpenRA.Mods.RA
 			{
 				if( IsCanceled || !target.IsValid ) return NextActivity;
 
-				if (self.TraitsImplementing<IDisable>().Any(d => d.Disabled))
+				if (self.IsDisabled()) return this;
-					return this;
 
 				var attack = self.Trait<AttackTurreted>();
 				const int RangeTolerance = 1;	/* how far inside our maximum range we should try to sit */

OpenRA.Mods.RA/Player/ClassicProductionQueue.cs

@@ -55,16 +55,14 @@ namespace OpenRA.Mods.RA
 					   && x.Trait.Info.Produces.Contains(Info.Type))
 				.OrderByDescending(x => x.Actor.IsPrimaryBuilding() ? 1 : 0 ); // prioritize the primary.
 
-			if (producers.Count() == 0)
+			if (!producers.Any())
 			{
 				CancelProduction(name,1);
 				return true;
 			}
 
-			foreach (var p in producers)
+			foreach (var p in producers.Where(p => !p.Actor.IsDisabled()))
 			{
-				if (IsDisabledBuilding(p.Actor)) continue;
-
 				if (p.Trait.Produce(p.Actor, Rules.Info[ name ]))
 				{
 					FinishProduction();

OpenRA.Mods.RA/Player/ProductionQueue.cs

@@ -294,11 +294,6 @@ namespace OpenRA.Mods.RA
 			Queue.Add(item);
 		}
 
-		protected static bool IsDisabledBuilding(Actor a)
-		{
-			return a.TraitsImplementing<IDisable>().Any(d => d.Disabled);
-		}
-
 		// Builds a unit from the actor that holds this queue (1 queue per building)
 		// Returns false if the unit can't be built
 		protected virtual bool BuildUnit( string name )
@@ -311,7 +306,7 @@ namespace OpenRA.Mods.RA
 			}
 
 			var sp = self.TraitsImplementing<Production>().FirstOrDefault(p => p.Info.Produces.Contains(Info.Type));
-			if (sp != null && !IsDisabledBuilding(self) && sp.Produce(self, Rules.Info[ name ]))
+			if (sp != null && !self.IsDisabled() && sp.Produce(self, Rules.Info[ name ]))
 			{
 				FinishProduction();
 				return true;

OpenRA.Mods.RA/ProvidesRadar.cs

@@ -24,8 +24,7 @@ namespace OpenRA.Mods.RA
 		bool UpdateActive(Actor self)
 		{
 			// Check if powered
-			if (self.TraitsImplementing<IDisable>().Any(d => d.Disabled))
+			if (self.IsDisabled()) return false;
-				return false;
 
 			var isJammed = self.World.ActorsWithTrait<JamsRadar>().Any(a => self.Owner != a.Actor.Owner
 				&& (self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<JamsRadarInfo>().Range);

OpenRA.Mods.RA/Render/RenderBuilding.cs

@@ -56,7 +56,7 @@ namespace OpenRA.Mods.RA.Render
 
 		public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
 		{
-			var disabled = self.TraitsImplementing<IDisable>().Any(d => d.Disabled);
+			var disabled = self.IsDisabled();
 			foreach (var a in r)
 			{
 				var ret = a.WithPos(a.Pos - Info.Origin);

OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs

@@ -131,36 +131,31 @@ namespace OpenRA.Mods.RA
 				Key = key;
 			}
 
-			static bool InstanceDisabled(SupportPower sp)
-			{
-				return sp.self.TraitsImplementing<IDisable>().Any(d => d.Disabled);
-			}
-
 			bool notifiedCharging;
 			bool notifiedReady;
+
 			public void Tick()
 			{
-				Active = !Disabled && Instances.Any(i => !InstanceDisabled(i));
+				if (Disabled || Instances.All(i => i.self.IsDisabled()))
+					return;
 
-				if (Active)
+				if (Manager.devMode.FastCharge && RemainingTime > 25)
+					RemainingTime = 25;
+
+				if (RemainingTime > 0) --RemainingTime;
+
+				var power = Instances.First();
+
+				if (!notifiedCharging)
 				{
-					var power = Instances.First();
+					power.Charging(power.self, Key);
-					if (Manager.devMode.FastCharge && RemainingTime > 25)
+					notifiedCharging = true;
-						RemainingTime = 25;
+				}
 
-					if (RemainingTime > 0) --RemainingTime;
+				if (RemainingTime == 0 && !notifiedReady)
-					if (!notifiedCharging)
+				{
-					{
+					power.Charged(power.self, Key);
-						power.Charging(power.self, Key);
+					notifiedReady = true;
-						notifiedCharging = true;
-					}
-
-					if (RemainingTime == 0
-						&& !notifiedReady)
-					{
-						power.Charged(power.self, Key);
-						notifiedReady = true;
-					}
 				}
 			}
 
@@ -177,7 +172,7 @@ namespace OpenRA.Mods.RA
 				if (!Ready)
 					return;
 
-				var power = Instances.First(i => !InstanceDisabled(i));
+				var power = Instances.First(i => !i.self.IsDisabled());
 
 				// Note: order.Subject is the *player* actor
 				power.Activate(power.self, order);