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

Let pipImages tick using the appropriate interface.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-07-03 14:40:47 +02:00
parent 3e5155fa7d
commit 4325e1b400
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public int[] SelectionBoxBounds { get { return VisualBounds; } } public int[] SelectionBoxBounds { get { return VisualBounds; } }
} }
public class SelectionDecorations : IPostRenderSelection public class SelectionDecorations : IPostRenderSelection, ITick
{ {
// depends on the order of pips in TraitsInterfaces.cs! // depends on the order of pips in TraitsInterfaces.cs!
static readonly string[] PipStrings = { "pip-empty", "pip-green", "pip-yellow", "pip-red", "pip-gray", "pip-blue", "pip-ammo", "pip-ammoempty" }; static readonly string[] PipStrings = { "pip-empty", "pip-green", "pip-yellow", "pip-red", "pip-gray", "pip-blue", "pip-ammo", "pip-ammoempty" };
@@ -115,7 +115,6 @@ namespace OpenRA.Mods.Common.Traits.Render
var pal = wr.Palette(Info.Palette); var pal = wr.Palette(Info.Palette);
pipImages.PlayFetchIndex(Info.GroupSequence, () => (int)group); pipImages.PlayFetchIndex(Info.GroupSequence, () => (int)group);
pipImages.Tick();
var pos = basePosition - (0.5f * pipImages.Image.Size.XY).ToInt2() + new int2(9, 5); var pos = basePosition - (0.5f * pipImages.Image.Size.XY).ToInt2() + new int2(9, 5);
yield return new UISpriteRenderable(pipImages.Image, self.CenterPosition, pos, 0, pal, 1f); yield return new UISpriteRenderable(pipImages.Image, self.CenterPosition, pos, 0, pal, 1f);
@@ -156,5 +155,10 @@ namespace OpenRA.Mods.Common.Traits.Render
pipxyOffset = new int2(0, pipxyOffset.Y - (pipSize.Y + 1)); pipxyOffset = new int2(0, pipxyOffset.Y - (pipSize.Y + 1));
} }
} }
void ITick.Tick(Actor self)
{
pipImages.Tick();
}
} }
} }