games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-16 02:47:36 +02:00
Code Issues Releases Activity

Place objects away from wide connection

Browse Source
This commit is contained in:
Tomasz Zieliński 2023-06-18 19:20:12 +02:00
parent 47726625c2
commit 8510af487e
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/rmg/modificators/ConnectionsPlacer.cpp
View File

@ -147,6 +147,7 @@ void ConnectionsPlacer::selfSideDirectConnection(const rmg::ZoneConnection & con
{ {
zone.connectPath(ourPath); zone.connectPath(ourPath);
otherZone->connectPath(theirPath); otherZone->connectPath(theirPath);
otherZone->getModificator<ObjectManager>()->updateDistances(potentialPos);
success = true; success = true;
break; break;

12
lib/rmg/modificators/ObjectManager.cpp
View File

@ -86,6 +86,18 @@ void ObjectManager::updateDistances(const rmg::Object & obj)
} }
} }
void ObjectManager::updateDistances(const int3 & pos)
{
RecursiveLock lock(externalAccessMutex);
tilesByDistance.clear();
for (auto tile : zone.areaPossible().getTiles()) //don't need to mark distance for not possible tiles
{
ui32 d = pos.dist2dSQ(tile); //optimization, only relative distance is interesting
map.setNearestObjectDistance(tile, std::min(static_cast<float>(d), map.getNearestObjectDistance(tile)));
tilesByDistance.push(std::make_pair(tile, map.getNearestObjectDistance(tile)));
}
}
const rmg::Area & ObjectManager::getVisitableArea() const const rmg::Area & ObjectManager::getVisitableArea() const
{ {
RecursiveLock lock(externalAccessMutex); RecursiveLock lock(externalAccessMutex);

1
lib/rmg/modificators/ObjectManager.h
View File

@ -62,6 +62,7 @@ public:
void placeObject(rmg::Object & object, bool guarded, bool updateDistance); void placeObject(rmg::Object & object, bool guarded, bool updateDistance);
void updateDistances(const rmg::Object & obj); void updateDistances(const rmg::Object & obj);
void updateDistances(const int3& pos);
void createDistancesPriorityQueue(); void createDistancesPriorityQueue();
const rmg::Area & getVisitableArea() const; const rmg::Area & getVisitableArea() const;