Merge pull request #8662 from atlimit8/UpgradableTargetableUnit

Upgradable TargetableUnit & apply to Allies 03
2015-07-13 15:40:28 +02:00
parent 4297d06ba3 acc4b307b6
commit ea5ef1c500
5 changed files with 21 additions and 36 deletions
--- a/OpenRA.Mods.RA/Traits/TargetableSubmarine.cs
+++ b/OpenRA.Mods.RA/Traits/TargetableSubmarine.cs
@@ -34,7 +34,8 @@ namespace OpenRA.Mods.RA.Traits
 		{
 			get
 			{
-				return cloak.Cloaked ? info.CloakedTargetTypes : info.TargetTypes;
+				return IsTraitDisabled ? None
+					: (cloak.Cloaked ? info.CloakedTargetTypes : info.TargetTypes);
 			}
 		}
 	}