Fixed m_looseBombArea assertion

Nostalgia-Gamers · Jan 31, 2024 · aec3ba2 · aec3ba2
1 parent b34d564
commit aec3ba2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/regamedll/dlls/bot/cs_bot_manager.cpp b/regamedll/dlls/bot/cs_bot_manager.cpp
@@ -1452,7 +1452,7 @@ void CCSBotManager::SetLooseBomb(CBaseEntity *bomb)
 	if (bomb)
 	{
 		m_looseBombArea = TheNavAreaGrid.GetNearestNavArea(&bomb->pev->origin);
-		DbgAssert(m_looseBombArea); // TODO: Need investigation and find out why it cannot find nearest area for a lost bomb, just catch it
+		DbgAssert(!TheNavAreaGrid.IsValid() || m_looseBombArea); // TODO: Need investigation and find out why it cannot find nearest area for a lost bomb, just catch it
 	}
 	else
 	{

diff --git a/regamedll/game_shared/bot/nav_area.cpp b/regamedll/game_shared/bot/nav_area.cpp
@@ -4674,6 +4674,11 @@ void CNavAreaGrid::RemoveNavArea(CNavArea *area)
 	m_areaCount--;
 }
 
+bool CNavAreaGrid::IsValid() const
+{
+	return m_grid && m_areaCount > 0;
+}
+
 // Given a position, return the nav area that IsOverlapping and is *immediately* beneath it
 CNavArea *CNavAreaGrid::GetNavArea(const Vector *pos, float beneathLimit) const
 {

diff --git a/regamedll/game_shared/bot/nav_area.h b/regamedll/game_shared/bot/nav_area.h
@@ -503,6 +503,7 @@ class CNavAreaGrid
 	CNavArea *GetNavAreaByID(unsigned int id) const;
 	CNavArea *GetNearestNavArea(const Vector *pos, bool anyZ = false) const;
 
+	bool IsValid() const;
 	Place GetPlace(const Vector *pos) const;						// return radio chatter place for given coordinate
 
 private: