games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
AI/VCAI/Goals.cpp
View File

@ -154,8 +154,8 @@ bool Goals::AbstractGoal::operator== (AbstractGoal &g)
//TODO: find out why the following are not generated automatically on MVS?
namespace Goals
{
namespace Goals
{
template <>
void CGoal<Win>::accept (VCAI * ai)
{
@ -367,7 +367,7 @@ TSubgoal FindObj::whatToDoToAchieve()
std::string GetObj::completeMessage() const
{
return "hero " + hero.get()->name + " captured Object ID = " + boost::lexical_cast<std::string>(objid);
return "hero " + hero.get()->name + " captured Object ID = " + boost::lexical_cast<std::string>(objid);
}
TSubgoal GetObj::whatToDoToAchieve()
@ -409,7 +409,7 @@ bool GetObj::fulfillsMe (TSubgoal goal)
std::string VisitHero::completeMessage() const
{
return "hero " + hero.get()->name + " visited hero " + boost::lexical_cast<std::string>(objid);
return "hero " + hero.get()->name + " visited hero " + boost::lexical_cast<std::string>(objid);
}
TSubgoal VisitHero::whatToDoToAchieve()
@ -435,10 +435,18 @@ TSubgoal VisitHero::whatToDoToAchieve()
bool VisitHero::fulfillsMe (TSubgoal goal)
{
if (goal->goalType == Goals::VISIT_TILE && cb->getObj(ObjectInstanceID(objid))->visitablePos() == goal->tile)
return true;
else
if (goal->goalType != Goals::VISIT_TILE)
{
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()
@ -458,7 +466,7 @@ TSubgoal ClearWayTo::whatToDoToAchieve()
return sptr (Goals::Explore());
}
return (fh->chooseSolution(getAllPossibleSubgoals()));
return (fh->chooseSolution(getAllPossibleSubgoals()));
}
TGoalVec ClearWayTo::getAllPossibleSubgoals()
@ -862,7 +870,7 @@ TSubgoal GatherTroops::whatToDoToAchieve()
{
auto creatures = vstd::tryAt(t->town->creatures, creature->level - 1);
if(!creatures)
continue;
continue;
int upgradeNumber = vstd::find_pos(*creatures, creature->idNumber);
if(upgradeNumber < 0)
@ -957,7 +965,7 @@ TGoalVec Conquer::getAllPossibleSubgoals()
std::vector<const CGObjectInstance *> objs;
for (auto obj : ai->visitableObjs)
{
if (conquerable(obj))
if (conquerable(obj))
objs.push_back (obj);
}
@ -1035,7 +1043,7 @@ TGoalVec GatherArmy::getAllPossibleSubgoals()
{
//get all possible towns, heroes and dwellings we may use
TGoalVec ret;
//TODO: include evaluation of monsters gather in calculation
for (auto t : cb->getTownsInfo())
{