diff options
Diffstat (limited to 'src/common/Collision/DynamicTree.cpp')
| -rw-r--r-- | src/common/Collision/DynamicTree.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp index a32ad1e17c8..1c6e856e46d 100644 --- a/src/common/Collision/DynamicTree.cpp +++ b/src/common/Collision/DynamicTree.cpp @@ -26,6 +26,7 @@ #include "Timer.h" #include "GameObjectModel.h" #include "ModelInstance.h" +#include "ModelIgnoreFlags.h" #include <G3D/AABox.h> #include <G3D/Ray.h> @@ -151,7 +152,7 @@ struct DynamicTreeIntersectionCallback DynamicTreeIntersectionCallback(uint32 phasemask) : did_hit(false), phase_mask(phasemask) { } bool operator()(const G3D::Ray& r, const GameObjectModel& obj, float& distance) { - did_hit = obj.intersectRay(r, distance, true, phase_mask); + did_hit = obj.intersectRay(r, distance, true, phase_mask, VMAP::ModelIgnoreFlags::Nothing); return did_hit; } bool didHit() const { return did_hit;} @@ -168,7 +169,7 @@ struct DynamicTreeIntersectionCallback_WithLogger bool operator()(const G3D::Ray& r, const GameObjectModel& obj, float& distance) { TC_LOG_DEBUG("maps", "testing intersection with %s", obj.name.c_str()); - bool hit = obj.intersectRay(r, distance, true, phase_mask); + bool hit = obj.intersectRay(r, distance, true, phase_mask, VMAP::ModelIgnoreFlags::Nothing); if (hit) { did_hit = true; |