From 1762df2b775c405cc9f6c3c7892a46ff983b4c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Zieli=C5=84ski?= Date: Fri, 21 Jul 2023 14:55:49 +0200 Subject: [PATCH] Formatting --- lib/rmg/modificators/ObjectManager.cpp | 1 + lib/rmg/modificators/RoadPlacer.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/rmg/modificators/ObjectManager.cpp b/lib/rmg/modificators/ObjectManager.cpp index 2e75c38a1..5b8136a01 100644 --- a/lib/rmg/modificators/ObjectManager.cpp +++ b/lib/rmg/modificators/ObjectManager.cpp @@ -464,6 +464,7 @@ void ObjectManager::placeObject(rmg::Object & object, bool guarded, bool updateD objects.push_back(&instance->object()); if(auto * m = zone.getModificator()) { + //FIXME: Objects that can be removed, can be trespassed. Does not include Corpse if(instance->object().appearance->isVisitableFromTop()) m->areaForRoads().add(instance->getVisitablePosition()); else diff --git a/lib/rmg/modificators/RoadPlacer.cpp b/lib/rmg/modificators/RoadPlacer.cpp index 908e3d57d..498c4fab0 100644 --- a/lib/rmg/modificators/RoadPlacer.cpp +++ b/lib/rmg/modificators/RoadPlacer.cpp @@ -31,7 +31,7 @@ void RoadPlacer::process() void RoadPlacer::init() { - if (zone.isUnderground()) + if(zone.isUnderground()) { DEPENDENCY_ALL(RockFiller); } @@ -118,7 +118,7 @@ void RoadPlacer::drawRoads(bool secondary) zone.freePaths().unite(roads); } - if (!generator.getMapGenOptions().isRoadEnabled()) + if(!generator.getMapGenOptions().isRoadEnabled()) { return; } @@ -138,7 +138,7 @@ void RoadPlacer::drawRoads(bool secondary) //If our road type is not enabled, choose highest below it 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)); return; @@ -156,11 +156,11 @@ void RoadPlacer::connectRoads() { bool noRoadNodes = false; //Assumes objects are already placed - if (roadNodes.size() < 2) + if(roadNodes.size() < 2) { //If there are no nodes, draw roads to mines noRoadNodes = true; - if (auto* m = zone.getModificator()) + if(auto* m = zone.getModificator()) { for(auto * object : m->getMines()) {