瀏覽代碼

Restore compatibility with removal of getFaction()

Xilmi 1 年之前
父節點
當前提交
da32b8b58f
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      AI/Nullkiller/Behaviors/RecruitHeroBehavior.cpp
  2. 1 1
      AI/Nullkiller/Pathfinding/AINodeStorage.cpp

+ 1 - 1
AI/Nullkiller/Behaviors/RecruitHeroBehavior.cpp

@@ -87,7 +87,7 @@ Goals::TGoalVec RecruitHeroBehavior::decompose(const Nullkiller * ai) const
 					score *= score / minScoreToHireMain;
 					score *= score / minScoreToHireMain;
 				}
 				}
 				score *= (hero->getArmyCost() + currentArmyValue);
 				score *= (hero->getArmyCost() + currentArmyValue);
-				if (hero->type->heroClass->faction == town->getFaction())
+				if (hero->getFactionID() == town->getFactionID())
 					score *= 1.5;
 					score *= 1.5;
 				if (vstd::isAlmostZero(visitability))
 				if (vstd::isAlmostZero(visitability))
 					score *= 30 * town->getTownLevel();
 					score *= 30 * town->getTownLevel();

+ 1 - 1
AI/Nullkiller/Pathfinding/AINodeStorage.cpp

@@ -1198,7 +1198,7 @@ void AINodeStorage::calculateTownPortal(
 			}
 			}
 
 
 			if (targetTown->visitingHero
 			if (targetTown->visitingHero
-				&& (targetTown->visitingHero.get()->getFaction() != actor->hero->getFaction()
+				&& (targetTown->visitingHero.get()->getFactionID() != actor->hero->getFactionID()
 					|| targetTown->getUpperArmy()->stacksCount()))
 					|| targetTown->getUpperArmy()->stacksCount()))
 				continue;
 				continue;