diff options
| author | jackpoz <giacomopoz@gmail.com> | 2016-08-03 18:51:42 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2016-08-03 18:51:42 +0200 |
| commit | 02a9ae031e71a9d075a59b25240b7e9aee6a31bb (patch) | |
| tree | 2ff2232491a00ee1d7280bb0d92b2f6f2d7bd2a4 /src/common/Collision | |
| parent | 9bc28632b3fb59932d6d4ef124278915c5fa7c4f (diff) | |
Common/Maps: Reduce differences between 3.3.5 and 6.x branches
Partially port 1347d7cf7a8656f3db9d8b2f6e6d955e1fa8c129 too
Diffstat (limited to 'src/common/Collision')
| -rw-r--r-- | src/common/Collision/DynamicTree.cpp | 2 | ||||
| -rw-r--r-- | src/common/Collision/Models/ModelInstance.cpp | 1 | ||||
| -rw-r--r-- | src/common/Collision/Models/WorldModel.cpp | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp index 5d2e18b1a2e..111606644de 100644 --- a/src/common/Collision/DynamicTree.cpp +++ b/src/common/Collision/DynamicTree.cpp @@ -248,7 +248,7 @@ bool DynamicMapTree::isInLineOfSight(float x1, float y1, float z1, float x2, flo float DynamicMapTree::getHeight(float x, float y, float z, float maxSearchDist, uint32 phasemask) const { - G3D::Vector3 v(x, y, z); + G3D::Vector3 v(x, y, z + 0.5f); G3D::Ray r(v, G3D::Vector3(0, 0, -1)); DynamicTreeIntersectionCallback callback(phasemask); impl->intersectZAllignedRay(r, callback, maxSearchDist); diff --git a/src/common/Collision/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp index 10b83f1cb4f..54e5fe5c295 100644 --- a/src/common/Collision/Models/ModelInstance.cpp +++ b/src/common/Collision/Models/ModelInstance.cpp @@ -19,7 +19,6 @@ #include "ModelInstance.h" #include "WorldModel.h" #include "MapTree.h" -#include "VMapDefinitions.h" using G3D::Vector3; using G3D::Ray; diff --git a/src/common/Collision/Models/WorldModel.cpp b/src/common/Collision/Models/WorldModel.cpp index 7f009f1f330..96ee6d2d55c 100644 --- a/src/common/Collision/Models/WorldModel.cpp +++ b/src/common/Collision/Models/WorldModel.cpp @@ -17,7 +17,6 @@ */ #include "WorldModel.h" -#include "ModelInstance.h" #include "VMapDefinitions.h" #include "MapTree.h" |