From c6e6977bf6717e54426e34ba06f6e67eb43722a0 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 16 May 2013 00:52:35 +1200 Subject: [PATCH] Convert RallyPoint to world coordinates. --- OpenRA.Mods.RA/Effects/RallyPoint.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/OpenRA.Mods.RA/Effects/RallyPoint.cs b/OpenRA.Mods.RA/Effects/RallyPoint.cs index e2603633a6..6d784d12f9 100755 --- a/OpenRA.Mods.RA/Effects/RallyPoint.cs +++ b/OpenRA.Mods.RA/Effects/RallyPoint.cs @@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA.Effects } CPos cachedLocation; - public void Tick( World world ) + public void Tick(World world) { flag.Tick(); circles.Tick(); @@ -53,16 +53,10 @@ namespace OpenRA.Mods.RA.Effects if (building.IsInWorld && building.Owner == building.World.LocalPlayer && building.World.Selection.Actors.Contains(building)) { - var pos = Traits.Util.CenterOfCell(rp.rallyPoint); + var pos = cachedLocation.CenterPosition; var palette = wr.Palette(palettePrefix+building.Owner.InternalName); - - yield return new SpriteRenderable(circles.Image, - pos.ToFloat2() - .5f * circles.Image.size, - palette, (int)pos.Y); - - yield return new SpriteRenderable(flag.Image, - pos.ToFloat2() + new float2(-1,-17), - palette, (int)pos.Y); + yield return new SpriteRenderable(circles.Image, pos, 0, palette, 1f); + yield return new SpriteRenderable(flag.Image, pos, 0, palette, 1f, new int2(1, 17)); } } }