colosseum is now crowded with monsters; made the SaberMonster moving code more robust...

[chaz/carfire] / CarFire / CarFire / CarFire / PathFinder.cs

diff --git a/CarFire/CarFire/CarFire/PathFinder.cs b/CarFire/CarFire/CarFire/PathFinder.cs
index 53e148d1f2cc713b29940cd2613df0ac5462bcfb..ef41370ef4a3fc442b623d3a7d1d2be3c4748ab0 100644 (file)
--- a/CarFire/CarFire/CarFire/PathFinder.cs
+++ b/CarFire/CarFire/CarFire/PathFinder.cs
@@ -68,7 +68,7 @@ namespace CarFire
         /// <param name="start">The cell to start at.</param>\r
         /// <param name="finish">The desired destination.</param>\r
         /// <returns>A list of points representing the path through the grid,\r
-        /// ends points not included, or null if no path could be found.</return>\r
+        /// starting point not included, or null if no path could be found.</return>\r
         public List<Point> GetPath(Point start, Point finish)\r
         {\r
             return GetPath(start, finish, GetManhattanDistance, GetCost);\r
@@ -82,7 +82,7 @@ namespace CarFire
         /// <param name="finish">The desired destination.</param>\r
         /// <param name="heuristic">The heuristic function.</param>\r
         /// <returns>A list of points representing the path through the grid,\r
-        /// ends points not included, or null if no path could be found.</return>\r
+        /// starting point not included, or null if no path could be found.</return>\r
         public List<Point> GetPath(Point start, Point finish, Heuristic heuristic)\r
         {\r
             return GetPath(start, finish, heuristic, GetCost);\r
@@ -96,7 +96,7 @@ namespace CarFire
         /// <param name="finish">The desired destination.</param>\r
         /// <param name="costFunction">The cost function</param>\r
         /// <returns>A list of points representing the path through the grid,\r
-        /// ends points not included, or null if no path could be found.</return>\r
+        /// starting point not included, or null if no path could be found.</return>\r
         public List<Point> GetPath(Point start, Point finish, CostFunction costFunction)\r
         {\r
             return GetPath(start, finish, GetManhattanDistance, costFunction);\r
@@ -110,7 +110,7 @@ namespace CarFire
         /// <param name="heuristic">The heuristic function.</param>\r
         /// <param name="costFunction">The cost function.</param>\r
         /// <returns>A list of points representing the path through the grid,\r
-        /// ends points not included, or null if no path could be found.</return>\r
+        /// starting point not included, or null if no path could be found.</return>\r
         public List<Point> GetPath(Point start, Point finish, Heuristic heuristic, CostFunction costFunction)\r
         {\r
             mFringe = new BinaryHeap<Cell>();\r
@@ -127,13 +127,10 @@ namespace CarFire
                 if (cell.Point == finish)\r
                 {\r
                     List<Point> list = new List<Point>();\r
+                    list.Add(cell.Point);\r
 \r
                     cell = cell.Parent;\r
-                    while (cell.Point != start)\r
-                    {\r
-                        list.Add(cell.Point);\r
-                        cell = cell.Parent;\r
-                    }\r
+                    if (cell != null) for (; cell.Point != start; cell = cell.Parent) list.Add(cell.Point);\r
 \r
                     list.Reverse();\r
                     return list;\r
@@ -152,13 +149,12 @@ namespace CarFire
 #endif\r
                 foreach (Point point in neighbors)\r
                 {\r
-                    Cell inQueue = mCells[point.X, point.Y];\r
-\r
                     if (0 <= point.X && point.X < mGridWidth && 0 <= point.Y && point.Y < mGridHeight &&\r
                         mGrid[point.X, point.Y])\r
                     {\r
                         int cost = cell.G + costFunction(cell.Point, point);\r
 \r
+                        Cell inQueue = mCells[point.X, point.Y];\r
                         if (inQueue == null)\r
                         {\r
                             Cell neighbor = new Cell(point, cost, heuristic(point, finish), cell);\r