games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

Corrected offset check for required objects.

Browse Source
This commit is contained in:
DjWarmonger 2015-06-03 19:38:53 +02:00
parent 55c1a7eade
commit 923437bf76
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/rmg/CRmgTemplateZone.cpp
View File

@ -1449,7 +1449,8 @@ bool CRmgTemplateZone::createRequiredObjects(CMapGenerator* gen)
{
auto obj = object.first;
int3 pos;
do
int3 accessibleOffset;
while (true)
{
if (!findPlaceForObject(gen, obj, 3, pos))
{
@ -1464,10 +1465,22 @@ bool CRmgTemplateZone::createRequiredObjects(CMapGenerator* gen)
{
if (gen->map->isInTheMap(tile))
gen->setOccupied(tile, ETileType::BLOCKED);
}
}
accessibleOffset = getAccessibleOffset(gen, obj->appearance, pos, obj->getBlockedOffsets());
if (!accessibleOffset.valid())
{
logGlobal->warnStream() << boost::format("Cannot access required object at position %s, retrying") % pos;
continue;
}
if (!connectPath(gen, accessibleOffset, true))
{
logGlobal->warnStream() << boost::format("Failed to create path to required object at position %s, retrying") % pos;
continue;
}
else
break;
}
while (!connectPath(gen, getAccessibleOffset(gen, obj->appearance, pos, obj->getBlockedOffsets()), true)); //position was wrong, cannot connect it with free paths
placeObject(gen, obj, pos);
guardObject (gen, obj, object.second, (obj->ID == Obj::MONOLITH_TWO_WAY), true);
@ -1818,7 +1831,7 @@ int3 CRmgTemplateZone::getAccessibleOffset(CMapGenerator* gen, ObjectTemplate &a
{
if (x && y) //check only if object is visitable from another tile
{
int3 offset = appearance.getVisitableOffset() + int3(x, y, 0);
int3 offset = int3(x, y, 0) - appearance.getVisitableOffset();
if (!vstd::contains(tilesBlockedByObject, offset))
{
int3 nearbyPos = tile + offset;