Support multiple ITargetable traits

2015-07-13 15:22:39 -05:00
parent 4bd34e3ed3
commit f5c3575c5a
13 changed files with 39 additions and 38 deletions
--- a/OpenRA.Mods.Common/Traits/Air/TargetableAircraft.cs
+++ b/OpenRA.Mods.Common/Traits/Air/TargetableAircraft.cs
@@ -35,8 +35,7 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			get
 			{
-				return IsTraitDisabled ? None
-					: (self.CenterPosition.Z > 0 ? info.TargetTypes : info.GroundedTargetTypes);
+				return (self.CenterPosition.Z > 0) ? info.TargetTypes : info.GroundedTargetTypes;
 			}
 		}
 	}