games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

Check against nullptr in VisitHero::fulfillsMe()

Browse Source
This commit is contained in:
Vadim Markovtsev
2016-01-19 20:25:15 +03:00
parent 02c3c226e6
commit 6eefce23fe
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
AI/VCAI/Goals.cpp
View File

@ -435,10 +435,18 @@ TSubgoal VisitHero::whatToDoToAchieve()
bool VisitHero::fulfillsMe (TSubgoal goal) bool VisitHero::fulfillsMe (TSubgoal goal)
{ {
if (goal->goalType == Goals::VISIT_TILE && cb->getObj(ObjectInstanceID(objid))->visitablePos() == goal->tile) if (goal->goalType != Goals::VISIT_TILE)
return true; {
else
return false; return false;
}
auto obj = cb->getObj(ObjectInstanceID(objid));
if (!obj)
{
logAi->errorStream() << boost::format("Hero %s: VisitHero::fulfillsMe at %s: object %d not found")
% hero.name % goal->tile % objid;
return false;
}
return obj->visitablePos() == goal->tile;
} }
TSubgoal GetArtOfType::whatToDoToAchieve() TSubgoal GetArtOfType::whatToDoToAchieve()