mirror of
https://github.com/vcmi/vcmi.git
synced 2026-05-22 09:55:17 +02:00
Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
@@ -68,10 +68,15 @@ void RecruitHero::accept(AIGateway * ai)
|
||||
throw cannotFulfillGoalException("Town " + t->nodeName() + " is occupied. Cannot recruit hero!");
|
||||
|
||||
cb->recruitHero(t, heroToHire);
|
||||
ai->nullkiller->heroManager->update();
|
||||
ai->nullkiller->objectClusterizer->reset();
|
||||
|
||||
if(t->visitingHero)
|
||||
{
|
||||
std::unique_lock lockGuard(ai->nullkiller->aiStateMutex);
|
||||
|
||||
ai->nullkiller->heroManager->update();
|
||||
ai->nullkiller->objectClusterizer->reset();
|
||||
}
|
||||
|
||||
if(t->visitingHero)A
|
||||
ai->moveHeroToTile(t->visitablePos(), t->visitingHero.get());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user