games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge pull request #1946 from vcmi/mines_after_monoliths

Browse Source 
Monoliths and Subterranean Gates placement tweaks
This commit is contained in:
DjWarmonger
2023-04-14 08:15:09 +02:00
committed by GitHub
parent 05550158ee 74d028d951
commit 2cac8fb419
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rmg/ConnectionsPlacer.cpp
View File

@@ -243,7 +243,7 @@ void ConnectionsPlacer::selfSideIndirectConnection(const rmg::ZoneConnection & c
path2 = managerOther.placeAndConnectObject(toPlace, rmgGate2, minDist, guarded2, true, ObjectManager::OptimizeType::NONE); 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); }, guarded1, true, ObjectManager::OptimizeType::DISTANCE);
if(path1.valid() && path2.valid()) if(path1.valid() && path2.valid())

2
lib/rmg/MinePlacer.cpp
View File

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