From a94286c23d02501ef25e1285fb9413dbdf2931bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Zieli=C5=84ski?=
 <tomaszzielinskijedenzwielu@gmail.com>
Date: Wed, 27 Mar 2024 08:03:19 +0100
Subject: [PATCH] Code cleanup

---
 lib/rmg/Zone.cpp                           | 1 -
 lib/rmg/modificators/ConnectionsPlacer.cpp | 3 ---
 lib/rmg/modificators/ObjectManager.cpp     | 1 -
 lib/rmg/modificators/RockFiller.cpp        | 2 +-
 lib/rmg/modificators/TreasurePlacer.cpp    | 3 +--
 lib/rmg/modificators/WaterRoutes.cpp       | 2 --
 6 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/rmg/Zone.cpp b/lib/rmg/Zone.cpp
index fa56f62e7..2bf28cae6 100644
--- a/lib/rmg/Zone.cpp
+++ b/lib/rmg/Zone.cpp
@@ -352,7 +352,6 @@ void Zone::fractalize()
 		}
 	}
 
-	//Lock lock(areaMutex);
 	//Connect with free areas
 	auto areas = connectedAreas(clearedTiles, true);
 	for(auto & area : areas)
diff --git a/lib/rmg/modificators/ConnectionsPlacer.cpp b/lib/rmg/modificators/ConnectionsPlacer.cpp
index 73e585386..e6692e260 100644
--- a/lib/rmg/modificators/ConnectionsPlacer.cpp
+++ b/lib/rmg/modificators/ConnectionsPlacer.cpp
@@ -35,7 +35,6 @@ std::pair<Zone::Lock, Zone::Lock> ConnectionsPlacer::lockZones(std::shared_ptr<Z
 
 	while (true)
 	{
-		// FIXME: What if every zone owns its own lock?
 		auto lock1 = Zone::Lock(zone.areaMutex, boost::try_to_lock);
 		auto lock2 = Zone::Lock(otherZone->areaMutex, boost::try_to_lock);
 
@@ -59,7 +58,6 @@ void ConnectionsPlacer::process()
 
 			while (cp)
 			{
-				// FIXME: It does lock ConnectionPlacer, but not areaMutex
 				RecursiveLock lock1(externalAccessMutex, boost::try_to_lock);
 				RecursiveLock lock2(cp->externalAccessMutex, boost::try_to_lock);
 				if (lock1.owns_lock() && lock2.owns_lock())
@@ -292,7 +290,6 @@ void ConnectionsPlacer::selfSideDirectConnection(const rmg::ZoneConnection & con
 					zone.freePaths()->add(guardPos);
 					map.setOccupied(guardPos, ETileType::FREE);
 					manager.updateDistances(guardPos);
-					// FIXME: Accessing other manager might lead to deadlock
 					otherZone->getModificator<ObjectManager>()->updateDistances(guardPos);
 				}
 				
diff --git a/lib/rmg/modificators/ObjectManager.cpp b/lib/rmg/modificators/ObjectManager.cpp
index e514d023a..80a813fd4 100644
--- a/lib/rmg/modificators/ObjectManager.cpp
+++ b/lib/rmg/modificators/ObjectManager.cpp
@@ -273,7 +273,6 @@ int3 ObjectManager::findPlaceForObject(const rmg::Area & searchArea, rmg::Object
 
 rmg::Path ObjectManager::placeAndConnectObject(const rmg::Area & searchArea, rmg::Object & obj, si32 min_dist, bool isGuarded, bool onlyStraight, OptimizeType optimizer) const
 {
-	//RecursiveLock lock(externalAccessMutex);
 	return placeAndConnectObject(searchArea, obj, [this, min_dist, &obj](const int3 & tile)
 	{
 		float bestDistance = 10e9;
diff --git a/lib/rmg/modificators/RockFiller.cpp b/lib/rmg/modificators/RockFiller.cpp
index 2d65f0cf2..429cf1364 100644
--- a/lib/rmg/modificators/RockFiller.cpp
+++ b/lib/rmg/modificators/RockFiller.cpp
@@ -65,7 +65,7 @@ void RockFiller::init()
 }
 
 char RockFiller::dump(const int3 & t)
-{	
+{
 	if(!map.getTile(t).terType->isPassable())
 	{
 		return zone.area()->contains(t) ? 'R' : 'E';
diff --git a/lib/rmg/modificators/TreasurePlacer.cpp b/lib/rmg/modificators/TreasurePlacer.cpp
index 8cfba8b3b..d472b6318 100644
--- a/lib/rmg/modificators/TreasurePlacer.cpp
+++ b/lib/rmg/modificators/TreasurePlacer.cpp
@@ -918,7 +918,7 @@ void TreasurePlacer::createTreasures(ObjectManager& manager)
 
 			{
 				Zone::Lock lock(zone.areaMutex); //We are going to subtract this area
-				
+
 				auto searchArea = zone.areaPossible().get();
 				searchArea.erase_if([this, &minDistance](const int3& tile) -> bool
 				{
@@ -954,7 +954,6 @@ void TreasurePlacer::createTreasures(ObjectManager& manager)
 					path = manager.placeAndConnectObject(searchArea, rmgObject, minDistance, guarded, false, ObjectManager::OptimizeType::DISTANCE);
 				}
 			}
-			//lock.unlock();
 
 			if (path.valid())
 			{
diff --git a/lib/rmg/modificators/WaterRoutes.cpp b/lib/rmg/modificators/WaterRoutes.cpp
index 8d78601ac..e765a1ad1 100644
--- a/lib/rmg/modificators/WaterRoutes.cpp
+++ b/lib/rmg/modificators/WaterRoutes.cpp
@@ -43,8 +43,6 @@ void WaterRoutes::process()
 			result.push_back(wproxy->waterRoute(*z.second));
 	}
 
-	//Zone::Lock lock(zone.areaMutex);
-
 	auto area = zone.area();
 	auto freePaths = zone.freePaths();
 	auto areaPossible = zone.areaPossible();