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

Adds an IconPalette property to Buildable and SupportPower traits.

Browse Source
This commit is contained in:
Zimmermann Gyula
2015-06-12 09:37:33 +02:00
parent a4f85c6201
commit d5a5640f52
7 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/SupportPowersWidget.cs
View File

@@ -65,6 +65,7 @@ namespace OpenRA.Mods.Common.Widgets
public SupportPowerInstance Power;
public float2 Pos;
public Sprite Sprite;
public PaletteReference Palette;
public Hotkey Hotkey;
}
@@ -89,6 +90,7 @@ namespace OpenRA.Mods.Common.Widgets
Power = p,
Pos = new float2(rect.Location),
Sprite = icon.Image,
Palette = worldRenderer.Palette(p.Info.IconPalette),
Hotkey = ks.GetSupportPowerHotkey(IconCount)
};
@@ -139,7 +141,7 @@ namespace OpenRA.Mods.Common.Widgets
// Icons
foreach (var p in icons.Values)
{
WidgetUtils.DrawSHPCentered(p.Sprite, p.Pos + iconOffset, worldRenderer);
WidgetUtils.DrawSHPCentered(p.Sprite, p.Pos + iconOffset, p.Palette);
// Charge progress
var sp = p.Power;
@@ -148,7 +150,7 @@ namespace OpenRA.Mods.Common.Widgets
* (clock.CurrentSequence.Length - 1) / sp.TotalTime);
clock.Tick();
WidgetUtils.DrawSHPCentered(clock.Image, p.Pos + iconOffset, worldRenderer);
WidgetUtils.DrawSHPCentered(clock.Image, p.Pos + iconOffset, p.Palette);
}
// Overlay