From 75c1084017ce4b412ecb1e9d1747e55f8f8242c9 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sat, 5 Dec 2009 19:25:52 +1300
Subject: [PATCH 1/3] patched dist script to allow '--nomix'

---
 makedist.cmd | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/makedist.cmd b/makedist.cmd
index 7807942a83..491b62eefe 100644
--- a/makedist.cmd
+++ b/makedist.cmd
@@ -1,15 +1,17 @@
-rmdir /s /q ..\openra-bin
-mkdir ..\openra-bin
-copy *.mix ..\openra-bin\
-copy *.ini ..\openra-bin\
-copy *.rem ..\openra-bin\
-copy *.til ..\openra-bin\
-copy INSTALL ..\openra-bin\
-copy LICENSE ..\openra-bin\
-copy *.fx ..\openra-bin\
-copy *.xml ..\openra-bin\
-copy specialbin.png ..\openra-bin\
-copy OpenRA.Server\bin\debug\OpenRA.Server ..\openra-bin\
-copy SequenceEditor\bin\x86\debug\SequenceEditor.exe ..\openra-bin\
-copy OpenRA.Game\bin\x86\debug\*.dll ..\openra-bin\
-copy OpenRA.Game\bin\x86\debug\OpenRa.Game.exe ..\openra-bin\
\ No newline at end of file
+@rmdir /s /q ..\openra-bin
+@mkdir ..\openra-bin
+@if "%1"=="--nomix" goto nomix
+@copy *.mix ..\openra-bin\
+:nomix
+@copy *.ini ..\openra-bin\
+@copy *.rem ..\openra-bin\
+@copy *.til ..\openra-bin\
+@copy INSTALL ..\openra-bin\
+@copy LICENSE ..\openra-bin\
+@copy *.fx ..\openra-bin\
+@copy *.xml ..\openra-bin\
+@copy specialbin.png ..\openra-bin\
+@copy OpenRA.Server\bin\debug\OpenRA.Server.exe ..\openra-bin\
+@copy SequenceEditor\bin\x86\debug\SequenceEditor.exe ..\openra-bin\
+@copy OpenRA.Game\bin\x86\debug\*.dll ..\openra-bin\
+@copy OpenRA.Game\bin\x86\debug\OpenRa.Game.exe ..\openra-bin\

From 6c2504c2bfad5dd97c993d62d7c53518d8c8578e Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sat, 5 Dec 2009 21:06:22 +1300
Subject: [PATCH 2/3] patched INSTALL to mention vc9.1 redist

---
 INSTALL | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/INSTALL b/INSTALL
index 7ee985cd9c..5eec9addfa 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,3 +27,7 @@ Other Notes:
   
 * When someone patches Ijw.DirectX, you need to do `git submodule update` in your OpenRA tree. This has so
     far happened *once*.
+
+* You'll also need the Visual C++ 2008 SP1 Redist. You can get this from Microsoft:
+
+	http://www.microsoft.com/downloads/details.aspx?familyid=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2
\ No newline at end of file

From 599509e71f609374f6df35319f6793a32ded3455 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sat, 5 Dec 2009 21:16:46 +1300
Subject: [PATCH 3/3] #96 fixed

---
 OpenRa.Game/PathSearch.cs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/OpenRa.Game/PathSearch.cs b/OpenRa.Game/PathSearch.cs
index 34aac4c7d4..cb2bc4dcd2 100755
--- a/OpenRa.Game/PathSearch.cs
+++ b/OpenRa.Game/PathSearch.cs
@@ -32,6 +32,10 @@ namespace OpenRa.Game
 			var p = queue.Pop();
 			cellInfo[ p.Location.X, p.Location.Y ].Seen = true;
 
+			if (!ignoreTerrain)
+				if (passableCost[(int)umt][p.Location.X, p.Location.Y] == float.PositiveInfinity)
+					return p.Location;
+
 			foreach( int2 d in Util.directions )
 			{
 				int2 newHere = p.Location + d;
@@ -96,23 +100,21 @@ namespace OpenRa.Game
 			return search;
 		}
 
-		public static PathSearch FromPoints( IEnumerable<int2> froms, int2 target, UnitMovementType umt, bool checkForBlocked )
+		public static PathSearch FromPoints(IEnumerable<int2> froms, int2 target, UnitMovementType umt, bool checkForBlocked)
 		{
-			var search = new PathSearch {
-				heuristic = DefaultEstimator( target ),
+			var search = new PathSearch
+			{
+				heuristic = DefaultEstimator(target),
 				umt = umt,
-				checkForBlocked = checkForBlocked };
+				checkForBlocked = checkForBlocked
+			};
 
-			foreach( var sl in froms )
-				search.AddInitialCell( sl );
+			foreach (var sl in froms)
+				search.AddInitialCell(sl);
 
 			return search;
 		}
 
-
-
-
-
 		static CellInfo[ , ] InitCellInfo()
 		{
 			var cellInfo = new CellInfo[ 128, 128 ];