games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

CPathfinder::evaluateAccessibility: apply more optimizations

Browse Source
This commit is contained in:
ArseniyShestakov
2015-11-22 21:31:47 +03:00
parent 2632389aaf
commit f4c06660e4
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/CPathfinder.cpp
View File

@@ -619,14 +619,14 @@ CGPathNode::EAccessibility CPathfinder::evaluateAccessibility(const int3 & pos,
{
for(const CGObjectInstance * obj : tinfo->visitableObjects)
{
if(obj->passableFor(hero->tempOwner))
{
return CGPathNode::ACCESSIBLE;
}
else if(obj->blockVisit)
if(obj->blockVisit)
{
return CGPathNode::BLOCKVIS;
}
else if(obj->passableFor(hero->tempOwner))
{
return CGPathNode::ACCESSIBLE;
}
else if(canSeeObj(obj))
{
return CGPathNode::VISITABLE;
@@ -634,13 +634,15 @@ CGPathNode::EAccessibility CPathfinder::evaluateAccessibility(const int3 & pos,
}
}
}
else if(guardingCreaturePosition(pos).valid() && !tinfo->blocked)
else if(tinfo->blocked)
{
return CGPathNode::BLOCKED;
}
else if(gs->guardingCreaturePosition(pos).valid())
{
// Monster close by; blocked visit for battle
return CGPathNode::BLOCKVIS;
}
else if(tinfo->blocked)
return CGPathNode::BLOCKED;
break;