fixed up weapon validity stuff

2010-04-01 22:21:04 +13:00
parent 9fa9ec6b5a
commit 268c714ac2
5 changed files with 18 additions and 27 deletions
--- a/OpenRA.Game/Combat.cs
+++ b/OpenRA.Game/Combat.cs
@@ -117,9 +117,8 @@ namespace OpenRA
 			if (weapon.Warheads.All( w => w.EffectivenessAgainst(target.Info.Traits.Get<OwnedActorInfo>().Armor) <= 0))
 				return false;

-			/* todo: access to UnderWater is interesting */
-//			if (projectile.UnderWater && !target.Info.Traits.Get<OwnedActorInfo>().WaterBound)
-//				return false;
+			if (weapon.Underwater && !target.Info.Traits.Get<OwnedActorInfo>().WaterBound)
+				return false;

 			return true;
 		}