Tomasz Zieliński 7 月之前
父節點
當前提交
7814d4ae8e
共有 2 個文件被更改,包括 1 次插入11 次删除
  1. 1 10
      lib/rmg/CZonePlacer.cpp
  2. 0 1
      lib/rmg/modificators/ConnectionsPlacer.cpp

+ 1 - 10
lib/rmg/CZonePlacer.cpp

@@ -1134,10 +1134,8 @@ void CZonePlacer::dropRandomRoads(vstd::RNG * rand)
 		}
 		}
 	} while(anyDropped);
 	} while(anyDropped);
 
 
-	// Use a set to track processed connection IDs to avoid duplicates
-	std::set<int> processedConnectionIds;
 	
 	
-	// Process each zone's connections
+	// Mark all remaining random connections as TRUE
 	for(auto & zonePtr : zones)
 	for(auto & zonePtr : zones)
 	{
 	{
 		for(auto & connection : zonePtr.second->getConnections())
 		for(auto & connection : zonePtr.second->getConnections())
@@ -1145,13 +1143,6 @@ void CZonePlacer::dropRandomRoads(vstd::RNG * rand)
 			if(connection.getRoadOption() == rmg::ERoadOption::ROAD_RANDOM)
 			if(connection.getRoadOption() == rmg::ERoadOption::ROAD_RANDOM)
 			{
 			{
 				auto id = connection.getId();
 				auto id = connection.getId();
-				// Only process each connection once
-				if(vstd::contains(processedConnectionIds, id))
-					continue;
-
-				processedConnectionIds.insert(id);
-				
-				// Use the new setRoadOption method
 				zonePtr.second->setRoadOption(id, rmg::ERoadOption::ROAD_TRUE);
 				zonePtr.second->setRoadOption(id, rmg::ERoadOption::ROAD_TRUE);
 			}
 			}
 		}
 		}

+ 0 - 1
lib/rmg/modificators/ConnectionsPlacer.cpp

@@ -110,7 +110,6 @@ void ConnectionsPlacer::init()
 	POSTFUNCTION(RoadPlacer);
 	POSTFUNCTION(RoadPlacer);
 	POSTFUNCTION(ObjectManager);
 	POSTFUNCTION(ObjectManager);
 	
 	
-	// FIXME: Use zones modified by CZonePlacer
 	for (auto c : zone.getConnections())
 	for (auto c : zone.getConnections())
 	{
 	{
 		addConnection(c);
 		addConnection(c);