games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-05-13 22:06:58 +02:00
Code Issues Releases Activity

Fixed placement of large obstacles.

Browse Source
This commit is contained in:
DjWarmonger 2014-07-08 08:59:13 +02:00
parent 866cd6f540
commit 3fb498713a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/rmg/CRmgTemplateZone.cpp
View File

@ -1036,7 +1036,7 @@ void CRmgTemplateZone::createObstacles(CMapGenerator* gen)
auto tryToPlaceObstacleHere = [this, gen](int3& tile)-> bool auto tryToPlaceObstacleHere = [this, gen](int3& tile)-> bool
{ {
auto temp = *RandomGeneratorUtil::nextItem(possibleObstacles, gen->rand); auto temp = *RandomGeneratorUtil::nextItem(possibleObstacles, gen->rand);
int3 obstaclePos = tile + temp.getBlockMapOffset(); int3 obstaclePos = tile - temp.getBlockMapOffset();
if (canObstacleBePlacedHere(gen, temp, obstaclePos)) //can be placed here if (canObstacleBePlacedHere(gen, temp, obstaclePos)) //can be placed here
{ {
auto obj = VLC->objtypeh->getHandlerFor(temp.id, temp.subid)->create(temp); auto obj = VLC->objtypeh->getHandlerFor(temp.id, temp.subid)->create(temp);
@ -1113,19 +1113,20 @@ bool CRmgTemplateZone::findPlaceForTreasurePile(CMapGenerator* gen, si32 min_dis
bool CRmgTemplateZone::canObstacleBePlacedHere(CMapGenerator* gen, ObjectTemplate &temp, int3 &pos) bool CRmgTemplateZone::canObstacleBePlacedHere(CMapGenerator* gen, ObjectTemplate &temp, int3 &pos)
{ {
if (!gen->map->isInTheMap(pos)) //blockmap may fit in the map, but botom-right corner does not
return false;
auto tilesBlockedByObject = temp.getBlockedOffsets(); auto tilesBlockedByObject = temp.getBlockedOffsets();
bool allTilesAvailable = true;
for (auto blockingTile : tilesBlockedByObject) for (auto blockingTile : tilesBlockedByObject)
{ {
int3 t = pos + blockingTile; int3 t = pos + blockingTile;
if (!gen->map->isInTheMap(t) || !(gen->isPossible(t) || gen->shouldBeBlocked(t))) if (!gen->map->isInTheMap(t) || !(gen->isPossible(t) || gen->shouldBeBlocked(t)))
{ {
allTilesAvailable = false; //if at least one tile is not possible, object can't be placed here return false; //if at least one tile is not possible, object can't be placed here
break;
} }
} }
return allTilesAvailable; return true;
} }
bool CRmgTemplateZone::findPlaceForObject(CMapGenerator* gen, CGObjectInstance* obj, si32 min_dist, int3 &pos) bool CRmgTemplateZone::findPlaceForObject(CMapGenerator* gen, CGObjectInstance* obj, si32 min_dist, int3 &pos)
@ -1207,7 +1208,7 @@ bool CRmgTemplateZone::findPlaceForObject(CMapGenerator* gen, CGObjectInstance*
void CRmgTemplateZone::checkAndPlaceObject(CMapGenerator* gen, CGObjectInstance* object, const int3 &pos) void CRmgTemplateZone::checkAndPlaceObject(CMapGenerator* gen, CGObjectInstance* object, const int3 &pos)
{ {
if (!gen->map->isInTheMap(pos)) if (!gen->map->isInTheMap(pos))
throw rmgException(boost::to_string(boost::format("Position of object %d at %s is outside the map") % object->id % object->pos())); throw rmgException(boost::to_string(boost::format("Position of object %d at %s is outside the map") % object->id % pos));
object->pos = pos; object->pos = pos;
if (object->isVisitable() && !gen->map->isInTheMap(object->visitablePos())) if (object->isVisitable() && !gen->map->isInTheMap(object->visitablePos()))