1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00

Merge branch 'develop' of https://github.com/vcmi/vcmi into develop

This commit is contained in:
DjWarmonger 2016-12-15 10:55:57 +01:00
commit f18d3d9844

View File

@ -107,9 +107,9 @@ struct SectorMap
bool markIfBlocked(TSectorID &sec, crint3 pos, const TerrainTile *t); bool markIfBlocked(TSectorID &sec, crint3 pos, const TerrainTile *t);
bool markIfBlocked(TSectorID &sec, crint3 pos); bool markIfBlocked(TSectorID &sec, crint3 pos);
TSectorID &retreiveTile(crint3 pos); TSectorID & retreiveTile(crint3 pos);
TSectorID &SectorMap::retreiveTileN(TSectorArray &vectors, const int3 &pos); TSectorID & retreiveTileN(TSectorArray &vectors, const int3 &pos);
const TSectorID &SectorMap::retreiveTileN(const TSectorArray &vectors, const int3 &pos); const TSectorID & retreiveTileN(const TSectorArray &vectors, const int3 &pos);
TerrainTile* getTile(crint3 pos) const; TerrainTile* getTile(crint3 pos) const;
std::vector<const CGObjectInstance *> getNearbyObjs(HeroPtr h, bool sectorsAround); std::vector<const CGObjectInstance *> getNearbyObjs(HeroPtr h, bool sectorsAround);