define torpedoes in a more generic way

fixes #3252 and closes #2097
2014-01-02 19:21:46 +01:00
parent 4b43bb1cad
commit 027a281ae3
4 changed files with 19 additions and 14 deletions
--- a/OpenRA.Game/GameRules/WeaponInfo.cs
+++ b/OpenRA.Game/GameRules/WeaponInfo.cs
@@ -179,13 +179,7 @@ namespace OpenRA.GameRules
 				if (!world.Map.IsInMap(cell))
 					return false;

-				if (ValidTargets.Contains("Ground") && world.GetTerrainType(cell) != "Water")
-					return true;
-
-				if (ValidTargets.Contains("Water") && world.GetTerrainType(cell) == "Water")
-					return true;
-
-				return false;
+				return true;
 			}

 			return false;