games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

Proper fix for the issue

Browse Source
This commit is contained in:
Tomasz Zieliński
2025-01-02 18:12:40 +01:00
parent ce003af4b9
commit a88a994d75
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,11 +419,13 @@ bool ObjectManager::createMonoliths()
return false; return false;
} }
// Once it can be created, replace with curved path // Object must be placed first so that curved path won't go through occupied tiles
placeObject(rmgObject, guarded, true, objInfo.createRoad);
// Once it can be created, replace with curved path.
replaceWithCurvedPath(path, zone, rmgObject.getVisitablePosition()); replaceWithCurvedPath(path, zone, rmgObject.getVisitablePosition());
zone.connectPath(path); zone.connectPath(path);
placeObject(rmgObject, guarded, true, objInfo.createRoad);
} }
vstd::erase_if(requiredObjects, [](const auto & objInfo) vstd::erase_if(requiredObjects, [](const auto & objInfo)
@ -452,6 +454,8 @@ bool ObjectManager::createRequiredObjects()
logGlobal->error("Failed to fill zone %d due to lack of space", zone.getId()); logGlobal->error("Failed to fill zone %d due to lack of space", zone.getId());
return false; return false;
} }
placeObject(rmgObject, guarded, true, objInfo.createRoad);
if (objInfo.createRoad) if (objInfo.createRoad)
{ {
// Once valid path can be created, replace with curved path // Once valid path can be created, replace with curved path
@ -459,7 +463,6 @@ bool ObjectManager::createRequiredObjects()
} }
zone.connectPath(path); zone.connectPath(path);
placeObject(rmgObject, guarded, true, objInfo.createRoad);
for(const auto & nearby : nearbyObjects) for(const auto & nearby : nearbyObjects)
{ {