From cb7b5dedd7786c1a3d8b1bb5e9e44fe5de540c7b Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@993157c7-ee19-0410-b2c4-bb4e9862e678>
Date: Sat, 21 Jul 2007 03:14:48 +0000
Subject: [PATCH] git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1316
 993157c7-ee19-0410-b2c4-bb4e9862e678

---
 OpenRa.FileFormats/Map.cs                    | 1 +
 OpenRa.FileFormats/OpenRa.FileFormats.csproj | 6 ++++++
 OpenRa.Game/PathFinder.cs                    | 5 ++---
 OpenRa.Game/Tree.cs                          | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/OpenRa.FileFormats/Map.cs b/OpenRa.FileFormats/Map.cs
index a9ff7154bf..1ae6c1508f 100644
--- a/OpenRa.FileFormats/Map.cs
+++ b/OpenRa.FileFormats/Map.cs
@@ -13,6 +13,7 @@ namespace OpenRa.FileFormats
 
 		public readonly int XOffset;
 		public readonly int YOffset;
+		public int2 Offset { get { return new int2( XOffset, YOffset ); } }
 
 		public readonly int Width;
 		public readonly int Height;
diff --git a/OpenRa.FileFormats/OpenRa.FileFormats.csproj b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
index a8633c178e..b029448f9a 100644
--- a/OpenRa.FileFormats/OpenRa.FileFormats.csproj
+++ b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
@@ -56,6 +56,12 @@
     <Compile Include="TreeReference.cs" />
     <Compile Include="Walkability.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenRa.DataStructures\OpenRa.DataStructures.csproj">
+      <Project>{2F9E7A23-56C0-4286-9C8E-1060A9B2F073}</Project>
+      <Name>OpenRa.DataStructures</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/OpenRa.Game/PathFinder.cs b/OpenRa.Game/PathFinder.cs
index bf6f2a70cb..7fa990ba8e 100644
--- a/OpenRa.Game/PathFinder.cs
+++ b/OpenRa.Game/PathFinder.cs
@@ -31,8 +31,7 @@ namespace OpenRa.Game
 
 		public List<int2> FindUnitPath( World world, Unit unit, DestinationFunc estimator )
 		{
-			int2 offset = new int2( map.XOffset, map.YOffset );
-			int2 startLocation = unit.Location + offset;
+			int2 startLocation = unit.Location + map.Offset;
 
 			CellInfo[ , ] cellInfo = new CellInfo[ 128, 128 ];
 
@@ -40,7 +39,7 @@ namespace OpenRa.Game
 				for( int y = 0 ; y < 128 ; y++ )
 					cellInfo[ x, y ] = new CellInfo( double.PositiveInfinity, new int2( x, y ), false );
 
-			return FindUnitPath( startLocation, estimator, offset, cellInfo );
+			return FindUnitPath( startLocation, estimator, map.Offset, cellInfo );
 		}
 
 		List<int2> FindUnitPath( int2 startLocation, DestinationFunc estimator, int2 offset, CellInfo[,] cellInfo )
diff --git a/OpenRa.Game/Tree.cs b/OpenRa.Game/Tree.cs
index 4a1261da22..0916e5bfc7 100644
--- a/OpenRa.Game/Tree.cs
+++ b/OpenRa.Game/Tree.cs
@@ -12,7 +12,7 @@ namespace OpenRa.Game
 
 		public Tree(TreeReference r, TreeCache renderer, Map map)
 		{
-			location = new int2( r.Location ) - new int2( map.XOffset, map.YOffset );
+			location = new int2( r.Location ) - map.Offset;
 			currentImages = new Sprite[] { renderer.GetImage(r.Image) };
 		}