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

Remove GetSiloFullness.

Browse Source
This commit is contained in:
Paul Chote
2011-01-02 11:53:01 +13:00
parent 2048900c10
commit f3da258763
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Traits/Player/PlayerResources.cs
View File

@@ -45,8 +45,6 @@ namespace OpenRA.Traits
public int DisplayCash; public int DisplayCash;
public int DisplayOre; public int DisplayOre;
public float GetSiloFullness() { return (float)Ore / OreCapacity; }
public void GiveOre(int num) public void GiveOre(int num)
{ {
Ore += num; Ore += num;

3
OpenRA.Mods.RA/Render/RenderBuildingOre.cs
View File

@@ -26,8 +26,9 @@ namespace OpenRA.Mods.RA.Render
public void BuildingComplete( Actor self ) public void BuildingComplete( Actor self )
{ {
var pr = self.Owner.PlayerActor.Trait<PlayerResources>();
anim.PlayFetchIndex( "idle", anim.PlayFetchIndex( "idle",
() => (int)( 4.9 * self.Owner.PlayerActor.Trait<PlayerResources>().GetSiloFullness() ) ); () => (49 * pr.Ore) / (10*pr.OreCapacity));
} }
} }
} }

2
OpenRA.Mods.RA/StoresOre.cs
View File

@@ -56,7 +56,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<PipType> GetPips(Actor self) public IEnumerable<PipType> GetPips(Actor self)
{ {
return Graphics.Util.MakeArray( Info.PipCount, 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 ); ? Info.PipColor : PipType.Transparent );
} }