From a4e2407d8e93611f8c6d09d0c5046f1f7fcf8ce5 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 16 Apr 2010 20:50:48 +1200 Subject: [PATCH] #156, #151 fixed: splash damage against invalid targets is now ignored --- OpenRA.Game/Combat.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenRA.Game/Combat.cs b/OpenRA.Game/Combat.cs index 01fb78bee4..2108eaae75 100644 --- a/OpenRA.Game/Combat.cs +++ b/OpenRA.Game/Combat.cs @@ -125,6 +125,9 @@ namespace OpenRA static float GetDamageToInflict(Actor target, ProjectileArgs args, WarheadInfo warhead, float modifier) { + // don't hit air units with splash from ground explosions, etc + if (!WeaponValidForTarget(args.weapon, target)) return 0f; + var selectable = target.Info.Traits.GetOrDefault(); var radius = selectable != null ? selectable.Radius : 0; var distance = Math.Max(0, (target.CenterLocation - args.dest).Length - radius);