games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Merge pull request #2563 from vcmi/fix_resources_near_mines

Browse Source 
Fix resources placed behind mines
This commit is contained in:
DjWarmonger 2023-08-18 09:12:56 +02:00 committed by GitHub
commit f9564dc8e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,23 +413,41 @@ bool ObjectManager::createRequiredObjects()
zone.connectPath(path);
placeObject(rmgObject, guarded, true);
for(const auto & nearby : nearbyObjects)
}
for(const auto & nearby : nearbyObjects)
{
auto * targetObject = nearby.nearbyTarget;
if (!targetObject || !targetObject->appearance)
{
if(nearby.nearbyTarget != objInfo.obj)
continue;
rmg::Object rmgNearObject(*nearby.obj);
rmg::Area possibleArea(rmgObject.instances().front()->getBlockedArea().getBorderOutside());
possibleArea.intersect(zone.areaPossible());
if(possibleArea.empty())
continue;
}
rmg::Object rmgNearObject(*nearby.obj);
rmg::Area possibleArea(rmg::Area(targetObject->getBlockedPos()).getBorderOutside());
possibleArea.intersect(zone.areaPossible());
if(possibleArea.empty())
{
rmgNearObject.clear();
continue;
}
rmgNearObject.setPosition(*RandomGeneratorUtil::nextItem(possibleArea.getTiles(), zone.getRand()));
placeObject(rmgNearObject, false, false);
auto path = zone.searchPath(rmgNearObject.getVisitablePosition(), false);
if (path.valid())
{
zone.connectPath(path);
}
else
{
for (auto* instance : rmgNearObject.instances())
{
rmgNearObject.clear();
continue;
logGlobal->error("Failed to connect nearby object %s at %s",
instance->object().getObjectName(), instance->getPosition(true).toString());
mapProxy->removeObject(&instance->object());
}
rmgNearObject.setPosition(*RandomGeneratorUtil::nextItem(possibleArea.getTiles(), zone.getRand()));
placeObject(rmgNearObject, false, false);
rmgNearObject.clear();
}
}