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

avoid unneccessary float calculations and conversions

Browse Source
This commit is contained in:
Matthias Mailänder
2013-03-25 12:35:00 +01:00
parent aa6f12f0a1
commit 813faee4aa
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/Health.cs
View File

@@ -75,7 +75,7 @@ namespace OpenRA.Traits
var oldState = this.DamageState; var oldState = this.DamageState;
/* apply the damage modifiers, if we have any. */ /* apply the damage modifiers, if we have any. */
var modifier = (float)self.TraitsImplementing<IDamageModifier>() var modifier = self.TraitsImplementing<IDamageModifier>()
.Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>()) .Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>())
.Select(t => t.GetDamageModifier(attacker, warhead)).Product(); .Select(t => t.GetDamageModifier(attacker, warhead)).Product();

2
OpenRA.Mods.RA/Activities/CaptureActor.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Activities
var capturesInfo = self.Info.Traits.Get<CapturesInfo>(); var capturesInfo = self.Info.Traits.Get<CapturesInfo>();
var health = target.Trait<Health>(); var health = target.Trait<Health>();
int damage = (int)(0.25 * health.MaxHP); int damage = health.MaxHP / 4;
// Need to be next to building, TODO: stop capture when going away // Need to be next to building, TODO: stop capture when going away
var mobile = self.Trait<Mobile>(); var mobile = self.Trait<Mobile>();