New types for cell and pixel coordinate position/vectors.

OpenRA.Game/Actor.cs

@@ -32,9 +32,9 @@ namespace OpenRA
 
 		public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } }
 
-		public int2 Location { get { return occupySpace.Value.TopLeft; } }
+		public CPos Location { get { return occupySpace.Value.TopLeft; } }
 
-		public int2 CenterLocation
+		public PPos CenterLocation
 		{
 			get
 			{
@@ -123,22 +123,30 @@ namespace OpenRA
 		// at its current altitude
 		Rectangle CalculateBounds(bool useAltitude)
 		{
-			var size = Size.Value;
+			var size = (PVecInt)(Size.Value);
 			var loc = CenterLocation - size / 2;
 
 			var si = Info.Traits.GetOrDefault<SelectableInfo>();
 			if (si != null && si.Bounds != null && si.Bounds.Length > 2)
 			{
+#if true
+				loc += new PVecInt(si.Bounds[2], si.Bounds[3]);
+#else
 				loc.X += si.Bounds[2];
 				loc.Y += si.Bounds[3];
+#endif
 			}
 
 			var move = Move.Value;
 			if (move != null)
 			{
+#if true
+				loc -= new PVecInt(0, move.Altitude);
+#else
 				loc.Y -= move.Altitude;
+#endif
 				if (useAltitude)
-					size = new int2(size.X, size.Y + move.Altitude);
+					size = new PVecInt(size.X, size.Y + move.Altitude);
 			}
 
 			return new Rectangle(loc.X, loc.Y, size.X, size.Y);