diff --git a/OpenRA.Game/Graphics/UISpriteRenderable.cs b/OpenRA.Game/Graphics/UISpriteRenderable.cs index 2188283a6c..03fc578280 100644 --- a/OpenRA.Game/Graphics/UISpriteRenderable.cs +++ b/OpenRA.Game/Graphics/UISpriteRenderable.cs @@ -17,14 +17,16 @@ namespace OpenRA.Graphics public struct UISpriteRenderable : IRenderable, IFinalizedRenderable { readonly Sprite sprite; + readonly WPos effectiveWorldPos; readonly int2 screenPos; readonly int zOffset; readonly PaletteReference palette; readonly float scale; - public UISpriteRenderable(Sprite sprite, int2 screenPos, int zOffset, PaletteReference palette, float scale) + public UISpriteRenderable(Sprite sprite, WPos effectiveWorldPos, int2 screenPos, int zOffset, PaletteReference palette, float scale) { this.sprite = sprite; + this.effectiveWorldPos = effectiveWorldPos; this.screenPos = screenPos; this.zOffset = zOffset; this.palette = palette; @@ -32,14 +34,14 @@ namespace OpenRA.Graphics } // Does not exist in the world, so a world positions don't make sense - public WPos Pos { get { return WPos.Zero; } } + public WPos Pos { get { return effectiveWorldPos; } } public WVec Offset { get { return WVec.Zero; } } public bool IsDecoration { get { return true; } } public PaletteReference Palette { get { return palette; } } public int ZOffset { get { return zOffset; } } - public IRenderable WithPalette(PaletteReference newPalette) { return new UISpriteRenderable(sprite, screenPos, zOffset, newPalette, scale); } + public IRenderable WithPalette(PaletteReference newPalette) { return new UISpriteRenderable(sprite, effectiveWorldPos, screenPos, zOffset, newPalette, scale); } public IRenderable WithZOffset(int newOffset) { return this; } public IRenderable OffsetBy(WVec vec) { return this; } public IRenderable AsDecoration() { return this; } diff --git a/OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs b/OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs index 609967c33e..6bdc6a3e71 100644 --- a/OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs +++ b/OpenRA.Mods.Common/Traits/Render/SelectionDecorations.cs @@ -114,7 +114,7 @@ namespace OpenRA.Mods.Common.Traits pipImages.Tick(); var pos = basePosition - (0.5f * pipImages.Image.Size).ToInt2() + new int2(9, 5); - yield return new UISpriteRenderable(pipImages.Image, pos, 0, pal, 1f); + yield return new UISpriteRenderable(pipImages.Image, self.CenterPosition, pos, 0, pal, 1f); } IEnumerable DrawPips(WorldRenderer wr, Actor self, int2 basePosition) @@ -146,7 +146,7 @@ namespace OpenRA.Mods.Common.Traits pipImages.PlayRepeating(PipStrings[(int)pip]); pipxyOffset += new int2(pipSize.X, 0); - yield return new UISpriteRenderable(pipImages.Image, pipxyBase + pipxyOffset, 0, pal, 1f); + yield return new UISpriteRenderable(pipImages.Image, self.CenterPosition, pipxyBase + pipxyOffset, 0, pal, 1f); } // Increment row @@ -169,7 +169,7 @@ namespace OpenRA.Mods.Common.Traits tagImages.PlayRepeating(TagStrings[(int)tag]); var pos = basePosition + tagxyOffset - (0.5f * tagImages.Image.Size).ToInt2(); - yield return new UISpriteRenderable(tagImages.Image, pos, 0, pal, 1f); + yield return new UISpriteRenderable(tagImages.Image, self.CenterPosition, pos, 0, pal, 1f); // Increment row tagxyOffset = tagxyOffset.WithY(tagxyOffset.Y + 8);