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

Improved guard placement for large objects.

Browse Source
This commit is contained in:
DjWarmonger 2014-06-15 09:39:30 +02:00
parent aa54803c50
commit 890f29fa7e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/rmg/CRmgTemplateZone.cpp
View File

@ -1059,19 +1059,28 @@ void CRmgTemplateZone::placeObject(CMapGenerator* gen, CGObjectInstance* object,
bool CRmgTemplateZone::guardObject(CMapGenerator* gen, CGObjectInstance* object, si32 str)
{
logGlobal->traceStream() << boost::format("Guard object at %d %d") % object->pos.x % object->pos.y;
int3 visitable = object->visitablePos();
std::vector<int3> tiles;
auto tilesBlockedByObject = object->getBlockedPos(); //absolue value, as object is already placed
gen->foreach_neighbour(visitable, [&](int3& pos)
{
logGlobal->traceStream() << boost::format("Block at %d %d") % pos.x % pos.y;
if (gen->isPossible(pos))
{
tiles.push_back(pos);
if (!vstd::contains(tilesBlockedByObject, pos))
{
if (object->appearance.isVisitableFrom(pos.x - visitable.x, pos.y - visitable.y) && !gen->isBlocked(pos)) //TODO: refactor - info about visitability from absolute coordinates
{
logGlobal->traceStream() << boost::format("Block at %d %d") % pos.x % pos.y;
tiles.push_back(pos);
}
}
};
});
if ( ! tiles.size())
if (!tiles.size())
{
logGlobal->infoStream() << "Failed";
return false;