git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1304 993157c7-ee19-0410-b2c4-bb4e9862e678

OpenRa.FileFormats/Map.cs

@@ -126,6 +126,11 @@ namespace OpenRa.FileFormats
 			foreach( KeyValuePair<string, string> kv in terrain )
 				Trees.Add( new TreeReference( int.Parse( kv.Key ), kv.Value ) );
 		}
+
+		public bool IsInMap(int x, int y)
+		{
+			return (x >= XOffset && y >= YOffset && x < XOffset + Width && y < YOffset + Height);
+		}
 	}
 
 	public struct TileReference

OpenRa.FileFormats/TileSet.cs

@@ -9,7 +9,8 @@ namespace OpenRa.FileFormats
 	public class TileSet
 	{
 		public readonly Dictionary<ushort, Terrain> tiles = new Dictionary<ushort, Terrain>();
-		public readonly Dictionary<ushort, Dictionary<int, int>> walk = 
+
+		readonly Dictionary<ushort, Dictionary<int, int>> walk = 
 			new Dictionary<ushort, Dictionary<int, int>>();	// cjf will fix
 
 		public readonly Package MixFile;
@@ -78,5 +79,13 @@ namespace OpenRa.FileFormats
 
 			return missingTile;
 		}
+
+		public int GetWalkability(TileReference r)
+		{
+			if (r.tile == 0xff || r.tile == 0xffff)
+				r.image = 0;
+
+			return walk[r.tile][r.image];
+		}
 	}
 }