Introduce IDecorationBounds to replace Actor.SelectionOverlayBounds.

OpenRA.Game/Traits/Selectable.cs

@@ -16,7 +16,7 @@ using OpenRA.Graphics;
 namespace OpenRA.Traits
 {
 	[Desc("This actor is selectable. Defines bounds of selectable area, selection class and selection priority.")]
-	public class SelectableInfo : ITraitInfo
+	public class SelectableInfo : ITraitInfo, IDecorationBoundsInfo
 	{
 		public readonly int Priority = 10;
 
@@ -35,7 +35,7 @@ namespace OpenRA.Traits
 		public object Create(ActorInitializer init) { return new Selectable(init.Self, this); }
 	}
 
-	public class Selectable : IMouseBounds
+	public class Selectable : IMouseBounds, IDecorationBounds
 	{
 		public readonly string Class = null;
 
@@ -61,5 +61,20 @@ namespace OpenRA.Traits
 			var xy = wr.ScreenPxPosition(self.CenterPosition) + offset;
 			return new Rectangle(xy.X, xy.Y, size.X + 2 * Info.Margin, size.Y + 2 * Info.Margin);
 		}
+
+		Rectangle IDecorationBounds.DecorationBounds(Actor self, WorldRenderer wr)
+		{
+			if (Info.Bounds == null)
+				return Rectangle.Empty;
+
+			var size = new int2(Info.Bounds[0], Info.Bounds[1]);
+
+			var offset = -size / 2;
+			if (Info.Bounds.Length > 2)
+				offset += new int2(Info.Bounds[2], Info.Bounds[3]);
+
+			var xy = wr.ScreenPxPosition(self.CenterPosition) + offset;
+			return new Rectangle(xy.X, xy.Y, size.X, size.Y);
+		}
 	}
 }

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -109,6 +109,10 @@ namespace OpenRA.Traits
 	public interface IMouseBounds { Rectangle MouseoverBounds(Actor self, WorldRenderer wr); }
 	public interface IAutoMouseBounds { Rectangle AutoMouseoverBounds(Actor self, WorldRenderer wr); }
 
+	// HACK: This provides a shim for legacy code until it can be rewritten
+	public interface IDecorationBounds { Rectangle DecorationBounds(Actor self, WorldRenderer wr); }
+	public interface IDecorationBoundsInfo : ITraitInfoInterface { }
+
 	public interface IAutoRenderSizeInfo : ITraitInfoInterface { }
 	public interface IAutoRenderSize { int2 RenderSize(Actor self); }