Fixed path finder thrown exception when finding a path to the cell you are already at.

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

diff --git a/CarFire/CarFire/CarFire/SaberMonster.cs b/CarFire/CarFire/CarFire/SaberMonster.cs
index c2932eed05f96802579e167bc08da82dc121b0e6..ce5916987a472986505a8c5f2c6284c2f89f14b5 100644 (file)
--- a/CarFire/CarFire/CarFire/SaberMonster.cs
+++ b/CarFire/CarFire/CarFire/SaberMonster.cs
@@ -100,8 +100,12 @@ namespace CarFire
             PathFinder pathFinder = new PathFinder(mGame.Grid);\r
             mPath = new List<Point>(32);\r
             mPath.Add(Coordinates);\r
-            mPath.AddRange(pathFinder.GetPath(mMotion.Coordinates, mIdlePath[mIdlePathIndex]));\r
-            mPath.Add(mIdlePath[mIdlePathIndex]);\r
+            List<Point> path = pathFinder.GetPath(mMotion.Coordinates, mIdlePath[mIdlePathIndex]);\r
+            if (path != null)\r
+            {\r
+                mPath.AddRange(path);\r
+                mPath.Add(mIdlePath[mIdlePathIndex]);\r
+            }\r
             mPathIndex = 0;\r
         }\r
 \r
@@ -115,8 +119,12 @@ namespace CarFire
                 PathFinder pathFinder = new PathFinder(mGame.Grid);\r
                 mPath = new List<Point>(32);\r
                 mPath.Add(Coordinates);\r
-                mPath.AddRange(pathFinder.GetPath(mMotion.Coordinates, mIdlePath[mIdlePathIndex % mIdlePath.Count]));\r
-                mPath.Add(mIdlePath[mIdlePathIndex % mIdlePath.Count]);\r
+                List<Point> path = pathFinder.GetPath(mMotion.Coordinates, mIdlePath[mIdlePathIndex % mIdlePath.Count]);\r
+                if (path != null)\r
+                {\r
+                    mPath.AddRange(path);\r
+                    mPath.Add(mIdlePath[mIdlePathIndex % mIdlePath.Count]);\r
+                }\r
                 mPathIndex = 0;\r
             }\r
 \r