games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Merge pull request #527 from nullkiller/ai-recruit-hero-freeze-patch

Browse Source 
AI: fix freeze while endlesly trying to recruit hero
This commit is contained in:
Alexander Shishkin 2018-12-25 19:47:01 +03:00 committed by GitHub
commit cbbb85fa87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AI/VCAI/VCAI.cpp
View File

@ -823,6 +823,7 @@ void VCAI::makeTurn()
} }
markHeroAbleToExplore(primaryHero()); markHeroAbleToExplore(primaryHero());
visitedHeroes.clear(); visitedHeroes.clear();
ai->ah->resetPaths();
try try
{ {
@ -1007,6 +1008,9 @@ void VCAI::mainLoop()
for (auto basicGoal : ultimateGoalsFromBasic[goalToRealize]) for (auto basicGoal : ultimateGoalsFromBasic[goalToRealize])
goalsToRemove.push_back(basicGoal); goalsToRemove.push_back(basicGoal);
// sometimes resource manager contains an elementar goal which is not able to execute anymore and just fails each turn.
ai->ah->notifyGoalCompleted(goalToRealize);
//we failed to realize best goal, but maybe others are still possible? //we failed to realize best goal, but maybe others are still possible?
} }
@ -2056,6 +2060,10 @@ void VCAI::tryRealize(Goals::RecruitHero & g)
//TODO try to free way to blocked town //TODO try to free way to blocked town
//TODO: adventure map tavern or prison? //TODO: adventure map tavern or prison?
} }
else
{
throw cannotFulfillGoalException("No town to recruit hero!");
}
} }
void VCAI::tryRealize(Goals::VisitTile & g) void VCAI::tryRealize(Goals::VisitTile & g)