Introduce Target.Type property.

2013-08-07 22:51:48 +12:00
parent fa517b8787
commit 4f3c9aa0af
18 changed files with 56 additions and 39 deletions
--- a/OpenRA.Game/GameRules/WeaponInfo.cs
+++ b/OpenRA.Game/GameRules/WeaponInfo.cs
@@ -151,12 +151,10 @@ namespace OpenRA.GameRules

 		public bool IsValidAgainst(Target target, World world)
 		{
-			if (!target.IsValid)
-				return false;
-
-			if (target.IsActor)
+			if (target.Type == TargetType.Actor)
 				return IsValidAgainst(target.Actor);
-			else
+
+			if (target.Type == TargetType.Terrain)
 			{
 				var cell = target.CenterPosition.ToCPos();
 				if (ValidTargets.Contains("Ground") && world.GetTerrainType(cell) != "Water")
@@ -167,6 +165,8 @@ namespace OpenRA.GameRules

 				return false;
 			}
+
+			return false;
 		}
 	}
 }