fixed bug where we'd defend enemy region on gas steal

earthiverse · Sep 23, 2015 · d0803ab · d0803ab
1 parent 740577c
commit d0803ab
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/UAlbertaBot/Source/CombatCommander.cpp b/UAlbertaBot/Source/CombatCommander.cpp
@@ -164,9 +164,22 @@ void CombatCommander::updateDefenseSquads()
         return; 
     }
 
+    BWTA::BaseLocation * enemyBaseLocation = InformationManager::Instance().getMainBaseLocation(BWAPI::Broodwar->enemy());
+    BWTA::Region * enemyRegion = NULL;
+    if (enemyBaseLocation)
+    {
+        enemyRegion = BWTA::getRegion(enemyBaseLocation->getPosition());
+    }
+
 	// for each of our occupied regions
 	for (BWTA::Region * myRegion : InformationManager::Instance().getOccupiedRegions(BWAPI::Broodwar->self()))
 	{
+        // don't defend inside the enemy region, this will end badly when we are stealing gas
+        if (myRegion == enemyRegion)
+        {
+            continue;
+        }
+
 		BWAPI::Position regionCenter = myRegion->getCenter();
 		if (!regionCenter.isValid())
 		{