epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#156, #151 fixed: splash damage against invalid targets is now ignored

Browse Source
This commit is contained in:
Chris Forbes
2010-04-16 20:50:48 +12:00
parent b5b943fee8
commit a4e2407d8e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Combat.cs
View File

@@ -125,6 +125,9 @@ namespace OpenRA
static float GetDamageToInflict(Actor target, ProjectileArgs args, WarheadInfo warhead, float modifier) 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<SelectableInfo>(); var selectable = target.Info.Traits.GetOrDefault<SelectableInfo>();
var radius = selectable != null ? selectable.Radius : 0; var radius = selectable != null ? selectable.Radius : 0;
var distance = Math.Max(0, (target.CenterLocation - args.dest).Length - radius); var distance = Math.Max(0, (target.CenterLocation - args.dest).Length - radius);