From 5a40c5df03ea65630d0a8cde971c9c8572a80761 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 1 Jul 2012 18:08:10 +1200
Subject: [PATCH] tidy health transfer

---
 OpenRA.Mods.RA/Activities/Transform.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OpenRA.Mods.RA/Activities/Transform.cs b/OpenRA.Mods.RA/Activities/Transform.cs
index 4641f91d40..5bba52cffa 100644
--- a/OpenRA.Mods.RA/Activities/Transform.cs
+++ b/OpenRA.Mods.RA/Activities/Transform.cs
@@ -52,11 +52,11 @@ namespace OpenRA.Mods.RA.Activities
 				var health = self.TraitOrDefault<Health>();
 				if (health != null)
 				{
-					// TODO: Fix bogus health init
-					if (ForceHealthPercentage > 0)
-						init.Add( new HealthInit( ForceHealthPercentage * 1f / 100 ));
-					else
-						init.Add( new HealthInit( (float)health.HP / health.MaxHP ));
+					var newHP = (ForceHealthPercentage > 0)
+						? ForceHealthPercentage / 100f
+						: (float)health.HP / health.MaxHP;
+
+					init.Add( new HealthInit(newHP) );
 				}
 
 				var cargo = self.TraitOrDefault<Cargo>();