1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00

Rename boats

This commit is contained in:
nordsoft
2023-04-20 21:20:51 +04:00
parent 9dbac414fc
commit de159df481
27 changed files with 61 additions and 72 deletions

View File

@@ -228,7 +228,7 @@ bool canBeEmbarkmentPoint(const TerrainTile * t, bool fromWater)
}
else if(!fromWater) // do not try to board when in water sector
{
if(t->visitableObjects.size() == 1 && t->topVisitableId() == Obj::TRANSPORT)
if(t->visitableObjects.size() == 1 && t->topVisitableId() == Obj::BOAT)
return true;
}
return false;
@@ -450,7 +450,7 @@ bool shouldVisit(const Nullkiller * ai, const CGHeroInstance * h, const CGObject
return ai->cb->getHeroesInfo().size() < VLC->settings()->getInteger(EGameSettings::HEROES_PER_PLAYER_ON_MAP_CAP);
case Obj::TAVERN:
case Obj::EYE_OF_MAGI:
case Obj::TRANSPORT:
case Obj::BOAT:
case Obj::SIGN:
return false;
}

View File

@@ -193,7 +193,7 @@ void ObjectClusterizer::clusterize()
blockedObjects.clear();
Obj ignoreObjects[] = {
Obj::TRANSPORT,
Obj::BOAT,
Obj::EYE_OF_MAGI,
Obj::MONOLITH_ONE_WAY_ENTRANCE,
Obj::MONOLITH_ONE_WAY_EXIT,

View File

@@ -198,7 +198,7 @@ bool canBeEmbarkmentPoint(const TerrainTile * t, bool fromWater)
}
else if(!fromWater) // do not try to board when in water sector
{
if(t->visitableObjects.size() == 1 && t->topVisitableId() == Obj::TRANSPORT)
if(t->visitableObjects.size() == 1 && t->topVisitableId() == Obj::BOAT)
return true;
}
return false;

View File

@@ -2863,7 +2863,7 @@ bool shouldVisit(HeroPtr h, const CGObjectInstance * obj)
return false;
break;
}
case Obj::TRANSPORT:
case Obj::BOAT:
return false;
//Boats are handled by pathfinder
case Obj::EYE_OF_MAGI: