From f3da25876303cc9bf171f1b6a7f827af191ce89c Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sun, 2 Jan 2011 11:53:01 +1300
Subject: [PATCH] Remove GetSiloFullness.

---
 OpenRA.Game/Traits/Player/PlayerResources.cs | 2 --
 OpenRA.Mods.RA/Render/RenderBuildingOre.cs   | 3 ++-
 OpenRA.Mods.RA/StoresOre.cs                  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/OpenRA.Game/Traits/Player/PlayerResources.cs b/OpenRA.Game/Traits/Player/PlayerResources.cs
index 5faface182..c1da65a4bb 100644
--- a/OpenRA.Game/Traits/Player/PlayerResources.cs
+++ b/OpenRA.Game/Traits/Player/PlayerResources.cs
@@ -45,8 +45,6 @@ namespace OpenRA.Traits
 		public int DisplayCash;
 		public int DisplayOre;
 
-		public float GetSiloFullness() { return (float)Ore / OreCapacity; }
-
 		public void GiveOre(int num)
 		{
 			Ore += num;
diff --git a/OpenRA.Mods.RA/Render/RenderBuildingOre.cs b/OpenRA.Mods.RA/Render/RenderBuildingOre.cs
index 736207a6cd..8759586a4f 100755
--- a/OpenRA.Mods.RA/Render/RenderBuildingOre.cs
+++ b/OpenRA.Mods.RA/Render/RenderBuildingOre.cs
@@ -26,8 +26,9 @@ namespace OpenRA.Mods.RA.Render
 
 		public void BuildingComplete( Actor self )
 		{
+			var pr = self.Owner.PlayerActor.Trait<PlayerResources>();
 			anim.PlayFetchIndex( "idle", 
-				() => (int)( 4.9 * self.Owner.PlayerActor.Trait<PlayerResources>().GetSiloFullness() ) );
+				() => (49 * pr.Ore) / (10*pr.OreCapacity));
 		}
 	}
 }
diff --git a/OpenRA.Mods.RA/StoresOre.cs b/OpenRA.Mods.RA/StoresOre.cs
index 664fb9163e..4179d86972 100644
--- a/OpenRA.Mods.RA/StoresOre.cs
+++ b/OpenRA.Mods.RA/StoresOre.cs
@@ -56,7 +56,7 @@ namespace OpenRA.Mods.RA
 		public IEnumerable<PipType> GetPips(Actor self)
 		{
 			return Graphics.Util.MakeArray( Info.PipCount, 
-				i => (Player.GetSiloFullness() > i * 1.0f / Info.PipCount) 
+				i => ( Player.Ore * Info.PipCount > i * Player.OreCapacity ) 
 					? Info.PipColor : PipType.Transparent );
 		}