Browse Source

Use getTileThreat-helper instead of directly accessing hitMap with tile coordinates

Joakim Thorén 1 year ago
parent
commit
88ec4fa0e7
1 changed files with 4 additions and 4 deletions
  1. 4 4
      AI/Nullkiller/Analyzers/DangerHitMapAnalyzer.cpp

+ 4 - 4
AI/Nullkiller/Analyzers/DangerHitMapAnalyzer.cpp

@@ -265,11 +265,11 @@ uint64_t DangerHitMapAnalyzer::enemyCanKillOurHeroesAlongThePath(const AIPath &
 {
 	int3 tile = path.targetTile();
 	int turn = path.turn();
-	const auto & fastestDanger = hitMap[tile.x][tile.y][tile.z].fastestDanger;
-	const auto & maximumDanger = hitMap[tile.x][tile.y][tile.z].maximumDanger;
 
-	return (fastestDanger.turn <= turn && !isSafeToVisit(path.targetHero, path.heroArmy, fastestDanger.danger))
-		|| (maximumDanger.turn <= turn && !isSafeToVisit(path.targetHero, path.heroArmy, maximumDanger.danger));
+	auto& info = getTileThreat(tile);
+	
+	return (info.fastestDanger.turn <= turn && !isSafeToVisit(path.targetHero, path.heroArmy, info.fastestDanger.danger))
+		|| (info.maximumDanger.turn <= turn && !isSafeToVisit(path.targetHero, path.heroArmy, info.maximumDanger.danger));
 }
 
 const HitMapNode & DangerHitMapAnalyzer::getObjectThreat(const CGObjectInstance * obj) const