Merge remote-tracking branch 'refs/remotes/davechurchill/master'

Conflicts: UAlbertaBot/Source/BOSSManager.cpp
earthiverse · Nov 21, 2015 · 0b36daf · 0b36daf
2 parents 2ec0ed3 + 0e845bb
commit 0b36daf
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/UAlbertaBot/Source/BOSSManager.cpp b/UAlbertaBot/Source/BOSSManager.cpp
@@ -31,12 +31,10 @@ void BOSSManager::reset()
 // start a new search for a new goal
 void BOSSManager::startNewSearch(const std::vector<MetaPair> & goalUnits)
 {
-    size_t numWorkers = UnitUtil::GetAllUnitCount(BWAPI::Broodwar->self()->getRace().getWorker());
-    size_t numDepots = UnitUtil::GetAllUnitCount(BWAPI::Broodwar->self()->getRace().getCenter());
-    if (BWAPI::Broodwar->self()->getRace() == BWAPI::Races::Zerg) {
-      numDepots += UnitUtil::GetAllUnitCount(BWAPI::UnitTypes::Zerg_Lair);
-      numDepots += UnitUtil::GetAllUnitCount(BWAPI::UnitTypes::Zerg_Hive);
-    }
+    size_t numWorkers   = UnitUtil::GetAllUnitCount(BWAPI::Broodwar->self()->getRace().getWorker());
+    size_t numDepots    = UnitUtil::GetAllUnitCount(BWAPI::Broodwar->self()->getRace().getCenter())
+                        + UnitUtil::GetAllUnitCount(BWAPI::UnitTypes::Zerg_Lair)
+                        + UnitUtil::GetAllUnitCount(BWAPI::UnitTypes::Zerg_Hive);
 
     if (numWorkers == 0)
     {