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

Do not calculate area for invalid positions

Browse Source
This commit is contained in:
Tomasz Zieliński 2023-12-13 22:06:47 +01:00
parent 2d3b8ee866
commit b9193ecb73
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/mapping/ObstacleProxy.cpp
View File

@ -84,16 +84,27 @@ int ObstacleProxy::getWeightedObjects(const int3 & tile, CRandomGenerator & rand
rmg::Object * rmgObject = &allObjects.back(); rmg::Object * rmgObject = &allObjects.back();
for(const auto & offset : obj->getBlockedOffsets()) for(const auto & offset : obj->getBlockedOffsets())
{ {
rmgObject->setPosition(tile - offset); auto newPos = tile - offset;
if(!isInTheMap(rmgObject->getPosition())) if(!isInTheMap(newPos))
continue; continue;
if(!rmgObject->getArea().getSubarea([this](const int3 & t) rmgObject->setPosition(newPos);
bool isInTheMapEntirely = true;
for (const auto & t : rmgObject->getArea().getTiles())
{
if (!isInTheMap(t))
{
isInTheMapEntirely = false;
break;
}
}
if (!isInTheMapEntirely)
{ {
return !isInTheMap(t);
}).empty())
continue; continue;
}
if(isProhibited(rmgObject->getArea())) if(isProhibited(rmgObject->getArea()))
continue; continue;