From b001c83bd5ef303b7b96c2bdc076cf6ed6bfc385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Wed, 6 Mar 2013 11:40:20 +0100
Subject: [PATCH] backport rallypoint changes to ai update branch

---
 OpenRA.Mods.RA/RallyPoint.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/OpenRA.Mods.RA/RallyPoint.cs b/OpenRA.Mods.RA/RallyPoint.cs
index 504d3ad01b..ba7bebd280 100755
--- a/OpenRA.Mods.RA/RallyPoint.cs
+++ b/OpenRA.Mods.RA/RallyPoint.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRA.Mods.RA.Effects;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
@@ -24,15 +23,13 @@ namespace OpenRA.Mods.RA
 
 	public class RallyPoint : IIssueOrder, IResolveOrder, ISync
 	{
-		[Sync]
-		public CPos rallyPoint;
+		[Sync] public CPos rallyPoint;
 		public int nearEnough = 1;
 
-		public RallyPoint(Actor self)
+		public RallyPoint(Actor self, RallyPointInfo info)
 		{
-			var info = self.Info.Traits.Get<RallyPointInfo>();
 			rallyPoint = self.Location + new CVec(info.RallyPoint[0], info.RallyPoint[1]);
-			self.World.AddFrameEndTask(w => w.Add(new Effects.RallyPoint(self)));
+			self.World.AddFrameEndTask(w => w.Add(new Effects.RallyPoint(self, info.IndicatorPalettePrefix)));
 		}
 
 		public IEnumerable<IOrderTargeter> Orders