Added int2.Clamp(Rectangle). All queries for map geometry use map.Bounds.

OpenRA.FileFormats/Map/MapStub.cs

@@ -35,17 +35,16 @@ namespace OpenRA.FileFormats
 		
 		[FieldLoader.Load] public int2 TopLeft;
 		[FieldLoader.Load] public int2 BottomRight;
-		public int Width { get { return BottomRight.X - TopLeft.X; } }
-		public int Height { get { return BottomRight.Y - TopLeft.Y; } }
-		public Rectangle Bounds { get { return Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y); } }
-
+		public Rectangle Bounds;
+		
 		public MapStub() {} // Hack for the editor - not used for anything important
 		public MapStub(IFolder container)
 		{
 			Container = container;
 			var yaml = MiniYaml.FromStream(Container.GetContent("map.yaml"));
 			FieldLoader.Load( this, new MiniYaml( null, yaml ) );
-			
+			
+			Bounds = Rectangle.FromLTRB(TopLeft.X, TopLeft.Y, BottomRight.X, BottomRight.Y);
 			Uid = Container.GetContent("map.uid").ReadAllText();
 		}
 

OpenRA.FileFormats/Primitives/int2.cs

@@ -72,5 +72,11 @@ namespace OpenRA
 		{
 			return a + ( b - a ) * mul / div;
 		}
+		
+		public int2 Clamp(Rectangle r)
+		{
+			return new int2(Math.Min(r.Right, Math.Max(X, r.Left)),
+			                Math.Min(r.Bottom, Math.Max(Y, r.Top)));
+		}
 	}
 }