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

Add ActorInfo.TraitInfo[OrDefault]<T>() requiring ITraitIfo types

Browse Source
This commit is contained in:
atlimit8
2015-08-03 16:07:33 -05:00
parent 6970959ef1
commit 09984683a7
115 changed files with 195 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs
View File

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.Common.Warheads
{
foreach (var unit in world.ActorMap.GetUnitsAt(cell))
{
var healthInfo = unit.Info.Traits.GetOrDefault<HealthInfo>();
var healthInfo = unit.Info.TraitInfoOrDefault<HealthInfo>();
if (healthInfo == null)
continue;

2
OpenRA.Mods.Common/Warheads/HealthPercentageDamageWarhead.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Warheads
public override void DoImpact(Actor victim, Actor firedBy, IEnumerable<int> damageModifiers)
{
var healthInfo = victim.Info.Traits.GetOrDefault<HealthInfo>();
var healthInfo = victim.Info.TraitInfoOrDefault<HealthInfo>();
if (healthInfo == null)
return;

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

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Warheads
continue;
var localModifiers = damageModifiers;
var healthInfo = victim.Info.Traits.GetOrDefault<HealthInfo>();
var healthInfo = victim.Info.TraitInfoOrDefault<HealthInfo>();
if (healthInfo != null)
{
var distance = Math.Max(0, (victim.CenterPosition - pos).Length - healthInfo.Radius.Length);