From 9b9952dcdf263d28dc26619e5f16e2132203d576 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Wed, 10 Jul 2013 19:08:53 +1200
Subject: [PATCH] Change ITargetable TargetableCells -> TargetablePositions.

---
 OpenRA.Game/Traits/Target.cs           | 2 +-
 OpenRA.Game/Traits/TraitsInterfaces.cs | 2 +-
 OpenRA.Mods.RA/TargetableBuilding.cs   | 4 ++--
 OpenRA.Mods.RA/TargetableUnit.cs       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenRA.Game/Traits/Target.cs b/OpenRA.Game/Traits/Target.cs
index 9d0466db0f..b02d17f278 100644
--- a/OpenRA.Game/Traits/Target.cs
+++ b/OpenRA.Game/Traits/Target.cs
@@ -80,7 +80,7 @@ namespace OpenRA.Traits
 				if (targetable == null)
 					return new []{actor.CenterPosition};
 
-				return targetable.TargetableCells(actor).Select(c => c.CenterPosition);
+				return targetable.TargetablePositions(actor);
 			}
 		}
 
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
index c857a32a33..8bcda46358 100755
--- a/OpenRA.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -201,7 +201,7 @@ namespace OpenRA.Traits
 	public interface ITargetable
 	{
 		string[] TargetTypes { get; }
-		IEnumerable<CPos> TargetableCells(Actor self);
+		IEnumerable<WPos> TargetablePositions(Actor self);
 		bool TargetableBy(Actor self, Actor byActor);
 	}
 
diff --git a/OpenRA.Mods.RA/TargetableBuilding.cs b/OpenRA.Mods.RA/TargetableBuilding.cs
index 5b75818cee..e02e9ff7c3 100755
--- a/OpenRA.Mods.RA/TargetableBuilding.cs
+++ b/OpenRA.Mods.RA/TargetableBuilding.cs
@@ -31,9 +31,9 @@ namespace OpenRA.Mods.RA
 		public string[] TargetTypes { get { return info.TargetTypes; } }
 		public bool TargetableBy(Actor self, Actor byActor) { return true; }
 
-		public IEnumerable<CPos> TargetableCells( Actor self )
+		public IEnumerable<WPos> TargetablePositions(Actor self)
 		{
-			return self.Trait<Building>().OccupiedCells().Select(c => c.First);
+			return self.Trait<Building>().OccupiedCells().Select(c => c.First.CenterPosition);
 		}
 	}
 }
diff --git a/OpenRA.Mods.RA/TargetableUnit.cs b/OpenRA.Mods.RA/TargetableUnit.cs
index 2cda0fa15a..01e6d582e9 100755
--- a/OpenRA.Mods.RA/TargetableUnit.cs
+++ b/OpenRA.Mods.RA/TargetableUnit.cs
@@ -52,9 +52,9 @@ namespace OpenRA.Mods.RA
 
 		public virtual string[] TargetTypes { get { return info.TargetTypes; } }
 
-		public virtual IEnumerable<CPos> TargetableCells( Actor self )
+		public virtual IEnumerable<WPos> TargetablePositions(Actor self)
 		{
-			yield return self.CenterPosition.ToCPos();
+			yield return self.CenterPosition;
 		}
 	}
 }