Fixed bot navigation route when connected area somehow is null

rehlds · Dec 31, 2023 · 991573f · 991573f
1 parent 6c9019b
commit 991573f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/regamedll/game_shared/bot/nav_area.cpp b/regamedll/game_shared/bot/nav_area.cpp
@@ -294,6 +294,8 @@ void CNavArea::OnDestroyNotify(CNavArea *dead)
 // Connect this area to given area in given direction
 void CNavArea::ConnectTo(CNavArea *area, NavDirType dir)
 {
+	DbgAssert(area);
+
 	// check if already connected
 	for (NavConnectList::iterator iter = m_connect[dir].begin(); iter != m_connect[dir].end(); iter++)
 	{

diff --git a/regamedll/game_shared/bot/nav_area.h b/regamedll/game_shared/bot/nav_area.h
@@ -683,7 +683,7 @@ bool NavAreaBuildPath(CNavArea *startArea, CNavArea *goalArea, const Vector *goa
 		int ladderTopDir;
 		while (true)
 		{
-			CNavArea *newArea;
+			CNavArea *newArea = nullptr;
 			NavTraverseType how;
 			const CNavLadder *ladder = nullptr;
 
@@ -716,6 +716,11 @@ bool NavAreaBuildPath(CNavArea *startArea, CNavArea *goalArea, const Vector *goa
 				newArea = (*floorIter).area;
 				how = (NavTraverseType)dir;
 				floorIter++;
+
+				DbgAssert(newArea);
+
+				if (!newArea)
+					continue;
 			}
 			// search ladders
 			else