fix NonMoving segv

gbom cell-size bump
spring · Jan 17, 2019 · be16529 · be16529
1 parent b5698c2
commit be16529
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/rts/Sim/Misc/GroundBlockingObjectMap.h b/rts/Sim/Misc/GroundBlockingObjectMap.h
@@ -107,7 +107,7 @@ template<typename T, size_t S> struct ArrayVector {
 
 
 
-typedef ArrayVector<CSolidObject, 8> BlockingMapCell;
+typedef ArrayVector<CSolidObject, 16> BlockingMapCell;
 typedef std::vector<BlockingMapCell> BlockingMap;
 
 class CGroundBlockingObjectMap

diff --git a/rts/Sim/Units/CommandAI/MobileCAI.cpp b/rts/Sim/Units/CommandAI/MobileCAI.cpp
@@ -1034,8 +1034,9 @@ void CMobileCAI::NonMoving()
 			buggerPos = buggerOffPos + buggerVec.Normalize() * buggerOffRadius * 1.25f;
 		}
 
-		// check if buggerPos is (still) reachable
-		if (!owner->moveDef->TestMoveSquare(nullptr, buggerPos, buggerVec))
+		// check if buggerPos is (still) reachable; aircraft
+		// (or all units) might want to ask the GBOM instead
+		if (owner->moveDef != nullptr && !owner->moveDef->TestMoveSquare(nullptr, buggerPos, buggerVec))
 			buggerPos = -OnesVector;
 	}