X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FPathFinder.cs;h=c37e51863d7ad4b4abe9b18c707de8a8126fcaf8;hp=91724384ab2ac4cccca98b2c830b66c0bff2c1e7;hb=d167160264cd2c33de81a71039eddbb959c40bb2;hpb=681f16a95c1c67bdd40ed16842a70f8e10ba31e1

diff --git a/CarFire/CarFire/CarFire/PathFinder.cs b/CarFire/CarFire/CarFire/PathFinder.cs
index 9172438..c37e518 100644
--- a/CarFire/CarFire/CarFire/PathFinder.cs
+++ b/CarFire/CarFire/CarFire/PathFinder.cs
@@ -1,4 +1,8 @@
-using System;
+
+// Uncomment this to disable diagonal movemet.
+//#define ALLOW_DIAGONAL_MOVEMENT
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -125,7 +129,7 @@ namespace CarFire
                     List<Point> list = new List<Point>();
 
                     cell = cell.Parent;
-                    while (cell.Point != start)
+                    while (cell != null && cell.Point != start)
                     {
                         list.Add(cell.Point);
                         cell = cell.Parent;
@@ -136,14 +140,16 @@ namespace CarFire
                 }
 
                 List<Point> neighbors = new List<Point>(8);
+                neighbors.Add(new Point(cell.Point.X, cell.Point.Y - 1));
+                neighbors.Add(new Point(cell.Point.X - 1, cell.Point.Y));
+                neighbors.Add(new Point(cell.Point.X + 1, cell.Point.Y));
+                neighbors.Add(new Point(cell.Point.X, cell.Point.Y + 1));
+#if ALLOW_DIAGONAL_MOVEMENT
                 neighbors.Add(new Point(cell.Point.X - 1, cell.Point.Y - 1));
-                neighbors.Add(new Point(cell.Point.X + 0, cell.Point.Y - 1));
                 neighbors.Add(new Point(cell.Point.X + 1, cell.Point.Y - 1));
-                neighbors.Add(new Point(cell.Point.X - 1, cell.Point.Y + 0));
-                neighbors.Add(new Point(cell.Point.X + 1, cell.Point.Y + 0));
                 neighbors.Add(new Point(cell.Point.X - 1, cell.Point.Y + 1));
-                neighbors.Add(new Point(cell.Point.X + 0, cell.Point.Y + 1));
                 neighbors.Add(new Point(cell.Point.X + 1, cell.Point.Y + 1));
+#endif
                 foreach (Point point in neighbors)
                 {
                     Cell inQueue = mCells[point.X, point.Y];