From aadceb085be21dce679d45b5bc3d7d13ae4d839c Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Wed, 10 Dec 2014 19:55:56 +0100
Subject: [PATCH] Renames RallyPoint effect to RallyPointIndicator

---
 .../Effects/{RallyPoint.cs => RallyPointIndicator.cs}     | 8 ++++----
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj              | 4 ++--
 OpenRA.Mods.Common/Traits/{ => Buildings}/RallyPoint.cs   | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename OpenRA.Mods.Common/Effects/{RallyPoint.cs => RallyPointIndicator.cs} (90%)
 rename OpenRA.Mods.Common/Traits/{ => Buildings}/RallyPoint.cs (94%)

diff --git a/OpenRA.Mods.Common/Effects/RallyPoint.cs b/OpenRA.Mods.Common/Effects/RallyPointIndicator.cs
similarity index 90%
rename from OpenRA.Mods.Common/Effects/RallyPoint.cs
rename to OpenRA.Mods.Common/Effects/RallyPointIndicator.cs
index a1561cc530..ebdf18cb0e 100644
--- a/OpenRA.Mods.Common/Effects/RallyPoint.cs
+++ b/OpenRA.Mods.Common/Effects/RallyPointIndicator.cs
@@ -16,20 +16,20 @@ using OpenRA.Mods.Common.Traits;
 
 namespace OpenRA.Mods.Common.Effects
 {
-	class RallyPoint : IEffect
+	class RallyPointIndicator : IEffect
 	{
 		readonly Actor building;
-		readonly Common.Traits.RallyPoint rp;
+		readonly RallyPoint rp;
 		readonly string palettePrefix;
 		readonly Animation flag;
 		readonly Animation circles;
 
-		public RallyPoint(Actor building, string palettePrefix)
+		public RallyPointIndicator(Actor building, string palettePrefix)
 		{
 			this.building = building;
 			this.palettePrefix = palettePrefix;
 
-			rp = building.Trait<Common.Traits.RallyPoint>();
+			rp = building.Trait<RallyPoint>();
 
 			flag = new Animation(building.World, "rallypoint");
 			circles = new Animation(building.World, "rallypoint");
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 44b1d0be0a..402dc736ef 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -63,7 +63,7 @@
     <Compile Include="Effects\Missile.cs" />
     <Compile Include="Effects\NukeLaunch.cs" />
     <Compile Include="Effects\PowerdownIndicator.cs" />
-    <Compile Include="Effects\RallyPoint.cs" />
+    <Compile Include="Effects\RallyPointIndicator.cs" />
     <Compile Include="Effects\Smoke.cs" />
     <Compile Include="Commands\ChatCommands.cs" />
     <Compile Include="Commands\DevCommands.cs" />
@@ -109,6 +109,7 @@
     <Compile Include="Traits\BlocksBullets.cs" />
     <Compile Include="Traits\Buildable.cs" />
     <Compile Include="Traits\Buildings\DeadBuildingState.cs" />
+    <Compile Include="Traits\Buildings\RallyPoint.cs" />
     <Compile Include="Traits\Burns.cs" />
     <Compile Include="Traits\CustomBuildTimeValue.cs" />
     <Compile Include="Traits\CustomSellValue.cs" />
@@ -137,7 +138,6 @@
     <Compile Include="Traits\Power\RequiresPower.cs" />
     <Compile Include="Traits\Power\ScalePowerWithHealth.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
-    <Compile Include="Traits\RallyPoint.cs" />
     <Compile Include="Traits\Render\RenderEditorOnly.cs" />
     <Compile Include="Traits\Render\RenderFlare.cs" />
     <Compile Include="Traits\Render\RenderNameTag.cs" />
diff --git a/OpenRA.Mods.Common/Traits/RallyPoint.cs b/OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
similarity index 94%
rename from OpenRA.Mods.Common/Traits/RallyPoint.cs
rename to OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
index 16e02c8578..e433a6d654 100644
--- a/OpenRA.Mods.Common/Traits/RallyPoint.cs
+++ b/OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Traits
@@ -29,7 +30,7 @@ namespace OpenRA.Mods.Common.Traits
 		public RallyPoint(Actor self, RallyPointInfo info)
 		{
 			Location = self.Location + info.RallyPoint;
-			self.World.AddFrameEndTask(w => w.Add(new Effects.RallyPoint(self, info.IndicatorPalettePrefix)));
+			self.World.AddFrameEndTask(w => w.Add(new RallyPointIndicator(self, info.IndicatorPalettePrefix)));
 		}
 
 		public IEnumerable<IOrderTargeter> Orders