games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Move road flag to placeObject() method

Browse Source
This commit is contained in:
Tomasz Zieliński
2023-07-07 20:17:20 +02:00
parent 3889193a48
commit 1cad64c470
7 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/rmg/modificators/WaterProxy.cpp
View File

@@ -126,6 +126,7 @@ void WaterProxy::collectLakes()
RouteInfo WaterProxy::waterRoute(Zone & dst)
{
RouteInfo result;
result.createRoad = false;
auto * adopter = dst.getModificator<WaterAdopter>();
if(!adopter)
@@ -162,7 +163,13 @@ RouteInfo WaterProxy::waterRoute(Zone & dst)
int zoneTowns = 0;
if(auto * m = dst.getModificator<TownPlacer>())
zoneTowns = m->getTotalTowns();
if (vstd::contains(lake.keepRoads, zone.getId()))
{
result.createRoad = true;
}
//FIXME: Why are Shipyards not allowed in zones with no towns?
if(dst.getType() == ETemplateZoneType::PLAYER_START || dst.getType() == ETemplateZoneType::CPU_START || zoneTowns)
{
if(placeShipyard(dst, lake, generator.getConfig().shipyardGuard, result))
@@ -284,7 +291,7 @@ bool WaterProxy::placeBoat(Zone & land, const Lake & lake, RouteInfo & info)
zone.connectPath(path);
land.connectPath(landPath);
manager->placeObject(rmgObject, false, true);
manager->placeObject(rmgObject, false, true, info.createRoad);
land.getModificator<ObjectManager>()->updateDistances(rmgObject); //Keep land objects away from the boat
break;
}
@@ -374,9 +381,7 @@ bool WaterProxy::placeShipyard(Zone & land, const Lake & lake, si32 guard, Route
info.boarding = boardingPosition;
info.water = shipPositions;
//TODO: Check connection properties
bool allowRoad = true;
manager->placeObject(rmgObject, guarded, true, allowRoad);
manager->placeObject(rmgObject, guarded, true, info.createRoad);
zone.areaPossible().subtract(shipyardOutToBlock);
for(const auto & i : shipyardOutToBlock.getTilesVector())