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

Refactoring

Browse Source
This commit is contained in:
DjWarmonger 2015-05-25 17:04:17 +02:00
parent 6d502ef1a1
commit bfd4ff8954
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapping/CMap.cpp
View File

@ -342,13 +342,11 @@ bool CMap::checkForVisitableDir(const int3 & src, const TerrainTile *pom, const
{ {
if (!pom->entrableTerrain()) //rock is never accessible if (!pom->entrableTerrain()) //rock is never accessible
return false; return false;
for(ui32 b=0; b<pom->visitableObjects.size(); ++b) //checking destination tile for (auto obj : pom->visitableObjects) //checking destination tile
{ {
if(!vstd::contains(pom->blockingObjects, pom->visitableObjects[b])) //this visitable object is not blocking, ignore if(!vstd::contains(pom->blockingObjects, obj)) //this visitable object is not blocking, ignore
continue; continue;
const CGObjectInstance * obj = pom->visitableObjects[b];
if (!obj->appearance.isVisitableFrom(src.x - dst.x, src.y - dst.y)) if (!obj->appearance.isVisitableFrom(src.x - dst.x, src.y - dst.y))
return false; return false;
} }