diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-03-04 08:23:19 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-03-04 08:23:19 -0500 |
| commit | 4029c2354739a42388b9d3cb4a1f3cdf6a3bff86 (patch) | |
| tree | f3ad478ba72f6ec425c362a0c95ca367fe4e7555 /src/server/collision/Models | |
| parent | c443b03010a1edecaa67f1a91a332a587bc7351c (diff) | |
Core/Collisions: Reverted a commit about M2 models.
closes #5312 and probably others
Diffstat (limited to 'src/server/collision/Models')
| -rw-r--r-- | src/server/collision/Models/WorldModel.cpp | 3 | ||||
| -rwxr-xr-x | src/server/collision/Models/WorldModel.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp index cda34510058..d4b08dde5dd 100644 --- a/src/server/collision/Models/WorldModel.cpp +++ b/src/server/collision/Models/WorldModel.cpp @@ -421,9 +421,6 @@ namespace VMAP bool WorldModel::IntersectRay(const G3D::Ray &ray, float &distance, bool stopAtFirstHit) const { - // M2 models are not taken into account for LoS calculation - if (Flags & MOD_M2) - return false; // small M2 workaround, maybe better make separate class with virtual intersection funcs // in any case, there's no need to use a bound tree if we only have one submodel if (groupModels.size() == 1) diff --git a/src/server/collision/Models/WorldModel.h b/src/server/collision/Models/WorldModel.h index dbaccb58573..ebf828e4935 100755 --- a/src/server/collision/Models/WorldModel.h +++ b/src/server/collision/Models/WorldModel.h @@ -113,7 +113,6 @@ namespace VMAP bool GetLocationInfo(const G3D::Vector3 &p, const G3D::Vector3 &down, float &dist, LocationInfo &info) const; bool writeFile(const std::string &filename); bool readFile(const std::string &filename); - uint32 Flags; protected: uint32 RootWMOID; std::vector<GroupModel> groupModels; |
