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

Refactored Health usage to IHealth.

Browse Source
This commit is contained in:
Andre Mohren
2018-09-27 02:02:08 +02:00
committed by reaperrr
parent 83cd7cf485
commit 640078a2b1
30 changed files with 68 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Captures.cs
View File

@@ -108,7 +108,7 @@ namespace OpenRA.Mods.Common.Traits
return false;
}
var health = target.Trait<Health>();
var health = target.Trait<IHealth>();
// Cast to long to avoid overflow when multiplying by the health
var lowEnoughHealth = health.HP <= (int)(c.Info.CaptureThreshold * (long)health.MaxHP / 100);
@@ -130,10 +130,10 @@ namespace OpenRA.Mods.Common.Traits
return false;
}
var health = target.Info.TraitInfoOrDefault<HealthInfo>();
var health = target.Info.TraitInfoOrDefault<IHealthInfo>();
// Cast to long to avoid overflow when multiplying by the health
var lowEnoughHealth = target.HP <= (int)(c.CaptureThreshold * (long)health.HP / 100);
var lowEnoughHealth = target.HP <= (int)(c.CaptureThreshold * (long)health.MaxHP / 100);
cursor = !capturesInfo.Sabotage || lowEnoughHealth || target.Owner.NonCombatant
? capturesInfo.EnterCursor : capturesInfo.SabotageCursor;