Переглянути джерело

Merge pull request #1946 from vcmi/mines_after_monoliths

Monoliths and Subterranean Gates placement tweaks
DjWarmonger 2 роки тому
батько
коміт
2cac8fb419
2 змінених файлів з 3 додано та 1 видалено
  1. 1 1
      lib/rmg/ConnectionsPlacer.cpp
  2. 2 0
      lib/rmg/MinePlacer.cpp

+ 1 - 1
lib/rmg/ConnectionsPlacer.cpp

@@ -243,7 +243,7 @@ void ConnectionsPlacer::selfSideIndirectConnection(const rmg::ZoneConnection & c
 				
 				path2 = managerOther.placeAndConnectObject(toPlace, rmgGate2, minDist, guarded2, true, ObjectManager::OptimizeType::NONE);
 				
-				return path2.valid() ? (dist + otherDist) : -1.f;
+				return path2.valid() ? (dist * otherDist) : -1.f;
 			}, guarded1, true, ObjectManager::OptimizeType::DISTANCE);
 			
 			if(path1.valid() && path2.valid())

+ 2 - 0
lib/rmg/MinePlacer.cpp

@@ -7,6 +7,7 @@
 #include "StdInc.h"
 #include "MinePlacer.h"
 #include "TownPlacer.h"
+#include "ConnectionsPlacer.h"
 #include "CMapGenerator.h"
 #include "RmgMap.h"
 #include "../mapping/CMap.h"
@@ -38,6 +39,7 @@ void MinePlacer::process()
 void MinePlacer::init()
 {
 	DEPENDENCY(TownPlacer);
+	DEPENDENCY(ConnectionsPlacer);
 	POSTFUNCTION(ObjectManager);
 	POSTFUNCTION(RoadPlacer);
 }