From 9532029b218e3618c13a9d5b225238e95cac30e3 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 20 Dec 2009 15:27:55 -0800 Subject: [PATCH] Wrap pips when there are too many, with included render bug. --- OpenRa.Game/Graphics/WorldRenderer.cs | 8 ++++++++ OpenRa.Game/Traits/Harvester.cs | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/OpenRa.Game/Graphics/WorldRenderer.cs b/OpenRa.Game/Graphics/WorldRenderer.cs index b58cceacf2..61890751c5 100644 --- a/OpenRa.Game/Graphics/WorldRenderer.cs +++ b/OpenRa.Game/Graphics/WorldRenderer.cs @@ -190,10 +190,18 @@ namespace OpenRa.Game.Graphics pipImages.PlayRepeating(pipStrings[(int)pip]); spriteRenderer.DrawSprite(pipImages.Image, pipxyBase + pipxyOffset, 0); pipxyOffset += new float2(4, 0); + + if (pipxyOffset.X+5 > selectedUnit.SelectedSize.X) + { + //spriteRenderer.Flush(); + pipxyOffset.X = 0; + pipxyOffset.Y -= 4; + } } // Increment row pipxyOffset.X = 0; pipxyOffset.Y -= 5; + //spriteRenderer.Flush(); } } diff --git a/OpenRa.Game/Traits/Harvester.cs b/OpenRa.Game/Traits/Harvester.cs index 588d7a9d7a..0356408c9e 100644 --- a/OpenRa.Game/Traits/Harvester.cs +++ b/OpenRa.Game/Traits/Harvester.cs @@ -57,7 +57,7 @@ namespace OpenRa.Game.Traits public IEnumerable GetPips() { - const int numPips = 7; + const int numPips = 20; for (int i = 0; i < numPips; i++) { if (gemsCarried * 1.0f / Rules.General.BailCount > i * 1.0f / numPips)