games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

Formatting

Browse Source
This commit is contained in:
Tomasz Zieliński 2023-07-21 14:55:49 +02:00
parent 8bfa34e97b
commit 1762df2b77
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/rmg/modificators/ObjectManager.cpp
View File

@ -464,6 +464,7 @@ void ObjectManager::placeObject(rmg::Object & object, bool guarded, bool updateD
objects.push_back(&instance->object()); objects.push_back(&instance->object());
if(auto * m = zone.getModificator<RoadPlacer>()) if(auto * m = zone.getModificator<RoadPlacer>())
{ {
//FIXME: Objects that can be removed, can be trespassed. Does not include Corpse
if(instance->object().appearance->isVisitableFromTop()) if(instance->object().appearance->isVisitableFromTop())
m->areaForRoads().add(instance->getVisitablePosition()); m->areaForRoads().add(instance->getVisitablePosition());
else else

10
lib/rmg/modificators/RoadPlacer.cpp
View File

@ -31,7 +31,7 @@ void RoadPlacer::process()
void RoadPlacer::init() void RoadPlacer::init()
{ {
if (zone.isUnderground()) if(zone.isUnderground())
{ {
DEPENDENCY_ALL(RockFiller); DEPENDENCY_ALL(RockFiller);
} }
@ -118,7 +118,7 @@ void RoadPlacer::drawRoads(bool secondary)
zone.freePaths().unite(roads); zone.freePaths().unite(roads);
} }
if (!generator.getMapGenOptions().isRoadEnabled()) if(!generator.getMapGenOptions().isRoadEnabled())
{ {
return; return;
} }
@ -138,7 +138,7 @@ void RoadPlacer::drawRoads(bool secondary)
//If our road type is not enabled, choose highest below it //If our road type is not enabled, choose highest below it
for (int8_t bestRoad = roadType.getNum(); bestRoad > RoadId(Road::NO_ROAD).getNum(); bestRoad--) for (int8_t bestRoad = roadType.getNum(); bestRoad > RoadId(Road::NO_ROAD).getNum(); bestRoad--)
{ {
if (generator.getMapGenOptions().isRoadEnabled(RoadId(bestRoad))) if(generator.getMapGenOptions().isRoadEnabled(RoadId(bestRoad)))
{ {
mapProxy->drawRoads(zone.getRand(), tiles, RoadId(bestRoad)); mapProxy->drawRoads(zone.getRand(), tiles, RoadId(bestRoad));
return; return;
@ -156,11 +156,11 @@ void RoadPlacer::connectRoads()
{ {
bool noRoadNodes = false; bool noRoadNodes = false;
//Assumes objects are already placed //Assumes objects are already placed
if (roadNodes.size() < 2) if(roadNodes.size() < 2)
{ {
//If there are no nodes, draw roads to mines //If there are no nodes, draw roads to mines
noRoadNodes = true; noRoadNodes = true;
if (auto* m = zone.getModificator<ObjectManager>()) if(auto* m = zone.getModificator<ObjectManager>())
{ {
for(auto * object : m->getMines()) for(auto * object : m->getMines())
{ {