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

Prepare transport enum

Browse Source
This commit is contained in:
nordsoft
2023-04-18 13:04:49 +04:00
parent 2babb5add5
commit ed798b06da
27 changed files with 78 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mapObjects/CObjectHandler.cpp
View File

@ -442,7 +442,7 @@ int3 IBoatGenerator::bestLocation() const
{
if(const TerrainTile *tile = IObjectInterface::cb->getTile(o->pos + offset, false)) //tile is in the map
{
if(tile->terType->isWater() && (!tile->blocked || tile->blockingObjects.front()->ID == Obj::BOAT)) //and is water and is not blocked or is blocked by boat
if(tile->terType->isWater() && (!tile->blocked || tile->blockingObjects.front()->ID == Obj::TRANSPORT)) //and is water and is not blocked or is blocked by boat
return o->pos + offset;
}
}
@ -457,16 +457,16 @@ IBoatGenerator::EGeneratorState IBoatGenerator::shipyardStatus() const
return TILE_BLOCKED; //no available water
else if(t->blockingObjects.empty())
return GOOD; //OK
else if(t->blockingObjects.front()->ID == Obj::BOAT)
else if(t->blockingObjects.front()->ID == Obj::TRANSPORT)
return BOAT_ALREADY_BUILT; //blocked with boat
else
return TILE_BLOCKED; //blocked
}
int IBoatGenerator::getBoatType() const
TransportId IBoatGenerator::getTransportType() const
{
//We make good ships by default
return 1;
return TransportId::ETransportId::BOAT_GOOD;
}