diff options
| author | QAston <qaston@gmail.com> | 2011-07-02 16:12:43 +0200 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-07-02 16:12:43 +0200 |
| commit | 1068583172141dcb1ca51a6b15fa2170ae094e97 (patch) | |
| tree | eea2c65e1458595c5b8f105d868c4f676f1ab286 /src/server/collision/Models | |
| parent | 86dde83ddade00c66a5af552d65d4787c22b6361 (diff) | |
| parent | f3dfa8066a291e144f53142d62b4e2f493e57137 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/collision/Models')
| -rw-r--r-- | src/server/collision/Models/WorldModel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp index 03101170c44..501be416a26 100644 --- a/src/server/collision/Models/WorldModel.cpp +++ b/src/server/collision/Models/WorldModel.cpp @@ -360,7 +360,7 @@ namespace VMAP bool GroupModel::IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const { - if (!triangles.size()) + if (triangles.empty()) return false; GModelRayCallback callback(triangles, vertices); meshTree.intersectRay(ray, callback, distance, stopAtFirstHit); @@ -369,7 +369,7 @@ namespace VMAP bool GroupModel::IsInsideObject(const Vector3 &pos, const Vector3 &down, float &z_dist) const { - if (!triangles.size() || !iBound.contains(pos)) + if (triangles.empty() || !iBound.contains(pos)) return false; GModelRayCallback callback(triangles, vertices); Vector3 rPos = pos - 0.1f * down; @@ -468,7 +468,7 @@ namespace VMAP bool WorldModel::IntersectPoint(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, AreaInfo &info) const { - if (!groupModels.size()) + if (groupModels.empty()) return false; WModelAreaCallback callback(groupModels, down); groupTree.intersectPoint(p, callback); @@ -486,7 +486,7 @@ namespace VMAP bool WorldModel::GetLocationInfo(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, LocationInfo &info) const { - if (!groupModels.size()) + if (groupModels.empty()) return false; WModelAreaCallback callback(groupModels, down); groupTree.intersectPoint(p, callback); |