games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

CPathfinder: deny transit over whirlpools when hero not protected

Browse Source
This commit is contained in:
ArseniyShestakov
2015-11-05 11:34:01 +03:00
parent a1290f548b
commit 5f3e9deda7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/CPathfinder.cpp
View File

@@ -315,7 +315,13 @@ bool CPathfinder::isMovementAfterDestPossible()
if(dp->coord == out.hpos) if(dp->coord == out.hpos)
return true; // This one is tricky, we can ignore fact that tile is not ACCESSIBLE in case if it's our hero block it. Though this need investigation return true; // This one is tricky, we can ignore fact that tile is not ACCESSIBLE in case if it's our hero block it. Though this need investigation
if(dp->accessible == CGPathNode::VISITABLE && CGTeleport::isTeleport(dt->topVisitableObj())) if(dp->accessible == CGPathNode::VISITABLE && CGTeleport::isTeleport(dt->topVisitableObj()))
return true; // For now we'll always allow transit for teleporters {
/// For now we'll always allow transit over teleporters
/// Transit over whirlpools only allowed when hero protected
auto whirlpool = dynamic_cast<const CGWhirlpool *>(dt->topVisitableObj());
if(!whirlpool || options.useTeleportWhirlpool)
return true;
}
if(useEmbarkCost && options.useEmbarkAndDisembark) if(useEmbarkCost && options.useEmbarkAndDisembark)
return true; return true;
break; break;