factor out build palette overlays; add timers
This commit is contained in:
@@ -235,10 +235,8 @@ namespace OpenRA.Mods.RA.Widgets
|
|||||||
clock.Tick();
|
clock.Tick();
|
||||||
WidgetUtils.DrawSHP(clock.Image, drawPos, worldRenderer);
|
WidgetUtils.DrawSHP(clock.Image, drawPos, worldRenderer);
|
||||||
|
|
||||||
if (firstOfThis.Done)
|
if (queue.CurrentItem() == firstOfThis)
|
||||||
textBits.Add( Pair.New( overlayPos, "READY" ) );
|
textBits.Add( Pair.New( overlayPos, GetOverlayForItem(firstOfThis) ) );
|
||||||
else if (firstOfThis.Paused)
|
|
||||||
textBits.Add( Pair.New( overlayPos, "ON HOLD" ) );
|
|
||||||
|
|
||||||
var repeats = queue.AllQueued().Count(a => a.Item == item.Name);
|
var repeats = queue.AllQueued().Count(a => a.Item == item.Name);
|
||||||
if (repeats > 1 || queue.CurrentItem() != firstOfThis)
|
if (repeats > 1 || queue.CurrentItem() != firstOfThis)
|
||||||
@@ -296,6 +294,13 @@ namespace OpenRA.Mods.RA.Widgets
|
|||||||
return 48 * y + 9;
|
return 48 * y + 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
string GetOverlayForItem(ProductionItem item)
|
||||||
|
{
|
||||||
|
if (item.Paused) return "ON HOLD";
|
||||||
|
if (item.Done) return "READY";
|
||||||
|
return WidgetUtils.FormatTime(item.RemainingTimeActual);
|
||||||
|
}
|
||||||
|
|
||||||
Action<MouseInput> HandleClick(string name, World world)
|
Action<MouseInput> HandleClick(string name, World world)
|
||||||
{
|
{
|
||||||
return mi => {
|
return mi => {
|
||||||
|
|||||||
Reference in New Issue
Block a user