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

Merge pull request #9763 from reaperrr/warhead-perf

Browse Source 
Attempt to reduce SpreadDamageWarhead CPU overhead
This commit is contained in:
RoosterDragon
2015-11-01 19:38:50 +00:00
parent 88c20a6654 731875c270
commit 7a6b5a0e55
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs
View File

@@ -22,10 +22,10 @@ namespace OpenRA.Mods.Common.Warheads
public readonly WDist Spread = new WDist(43); public readonly WDist Spread = new WDist(43);
[Desc("Extra search radius beyond maximum spread. Required to ensure damage to actors with large health radius.")] [Desc("Extra search radius beyond maximum spread. Required to ensure damage to actors with large health radius.")]
public readonly WDist TargetExtraSearchRadius = new WDist(2048); public readonly WDist TargetExtraSearchRadius = new WDist(1536);
[Desc("Damage percentage at each range step")] [Desc("Damage percentage at each range step")]
public readonly int[] Falloff = { 100, 37, 14, 5, 2, 1, 0 }; public readonly int[] Falloff = { 100, 37, 14, 5, 0 };
[Desc("Ranges at which each Falloff step is defined. Overrides Spread.")] [Desc("Ranges at which each Falloff step is defined. Overrides Spread.")]
public WDist[] Range = null; public WDist[] Range = null;
@@ -65,13 +65,13 @@ namespace OpenRA.Mods.Common.Warheads
if (!IsValidAgainst(victim, firedBy)) if (!IsValidAgainst(victim, firedBy))
continue; continue;
var localModifiers = damageModifiers;
var healthInfo = victim.Info.TraitInfoOrDefault<HealthInfo>(); var healthInfo = victim.Info.TraitInfoOrDefault<HealthInfo>();
if (healthInfo != null) if (healthInfo == null)
{ continue;
var distance = Math.Max(0, (victim.CenterPosition - pos).Length - healthInfo.Radius.Length);
localModifiers = localModifiers.Append(GetDamageFalloff(distance)); var localModifiers = damageModifiers;
} var distance = Math.Max(0, (victim.CenterPosition - pos).Length - healthInfo.Radius.Length);
localModifiers = localModifiers.Append(GetDamageFalloff(distance));
DoImpact(victim, firedBy, localModifiers); DoImpact(victim, firedBy, localModifiers);
} }