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

CPathfinder: fix and improve sail-land transition checks

Browse Source
This commit is contained in:
Arseniy Shestakov 2016-02-26 21:43:43 +03:00
parent 5408b6c1ff
commit 30189a386f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/CPathfinder.cpp
View File

@ -133,6 +133,7 @@ void CPathfinder::calculatePaths()
if(!hlp->isLayerAvailable(i))
continue;
/// Check transition without tile accessability rules
if(cp->layer != i && !isLayerTransitionPossible(i))
continue;
@ -143,6 +144,7 @@ void CPathfinder::calculatePaths()
if(dp->accessible == CGPathNode::NOT_SET)
continue;
/// Check transition using tile accessability rules
if(cp->layer != i && !isLayerTransitionPossible())
continue;
@ -302,16 +304,23 @@ bool CPathfinder::isLayerTransitionPossible(const ELayer destLayer) const
switch(cp->layer)
{
case ELayer::LAND:
if(destLayer != ELayer::AIR)
return true;
if(!options.lightweightFlyingMode || isSourceInitialPosition())
if(destLayer == ELayer::AIR)
{
if(!options.lightweightFlyingMode || isSourceInitialPosition())
return true;
}
else if(destLayer == ELayer::SAIL)
{
if(dt->isWater())
return true;
}
else
return true;
break;
case ELayer::SAIL:
if(destLayer == ELayer::LAND && gs->map->isCoastalTile(dp->coord))
if(destLayer == ELayer::LAND && !dt->isWater())
return true;
break;