diff options
Diffstat (limited to 'src/common/Collision/Maps/MapTree.h')
| -rw-r--r-- | src/common/Collision/Maps/MapTree.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h index c91983948b5..7f1415ff939 100644 --- a/src/common/Collision/Maps/MapTree.h +++ b/src/common/Collision/Maps/MapTree.h @@ -23,11 +23,13 @@ #include "BoundingIntervalHierarchy.h" #include <unordered_map> + namespace VMAP { class ModelInstance; class GroupModel; class VMapManager2; + enum class ModelIgnoreFlags : uint32; struct TC_COMMON_API LocationInfo { @@ -57,7 +59,7 @@ namespace VMAP std::string iBasePath; private: - bool getIntersectionTime(const G3D::Ray& pRay, float &pMaxDist, bool pStopAtFirstHit) const; + bool getIntersectionTime(const G3D::Ray& pRay, float &pMaxDist, bool pStopAtFirstHit, ModelIgnoreFlags ignoreFlags) const; //bool containsLoadedMapTile(unsigned int pTileIdent) const { return(iLoadedMapTiles.containsKey(pTileIdent)); } public: static std::string getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY); @@ -68,7 +70,7 @@ namespace VMAP StaticMapTree(uint32 mapID, const std::string &basePath); ~StaticMapTree(); - bool isInLineOfSight(const G3D::Vector3& pos1, const G3D::Vector3& pos2) const; + bool isInLineOfSight(const G3D::Vector3& pos1, const G3D::Vector3& pos2, ModelIgnoreFlags ignoreFlags) const; bool getObjectHitPos(const G3D::Vector3& pos1, const G3D::Vector3& pos2, G3D::Vector3& pResultHitPos, float pModifyDist) const; float getHeight(const G3D::Vector3& pPos, float maxSearchDist) const; bool getAreaInfo(G3D::Vector3 &pos, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const; |