From c4562ec73e7bd2412301958871a7a1327eacc8ce Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Sun, 29 Dec 2013 11:03:55 -0500
Subject: [PATCH] check to make sure flood fill doesn't crash when pmap is
 errored (?)

---
 SConscript                    |  2 +-
 src/simulation/Simulation.cpp | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/SConscript b/SConscript
index ad6501686..df8a6779a 100755
--- a/SConscript
+++ b/SConscript
@@ -535,7 +535,7 @@ sources+=Glob("generated/ToolClasses.cpp")
 
 env.Decider('MD5')
 
-# set a defaukt target
+# set a default target
 
 t=env.Program(target=programName, source=sources)
 Default(t)
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index eed9adf4d..999a6bbaa 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -1479,11 +1479,14 @@ int Simulation::FloodParts(int x, int y, int fullc, int cm, int flags)
 			}
 			x2++;
 		}
-		// fill span
-		for (x=x1; x<=x2; x++)
+		if (FloodFillPmapCheck(x2+1, y, cm))
 		{
-			if (CreateParts(x, y, 0, 0, fullc, flags))
-				created_something = 1;
+			// fill span
+			for (x=x1; x<=x2; x++)
+			{
+				if (CreateParts(x, y, 0, 0, fullc, flags))
+					created_something = 1;
+			}
 		}
 
 		if (c?y>=CELL+dy:y>=dy)