diff options
| author | Naios <naios-dev@live.de> | 2015-10-12 14:13:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-10-29 18:56:25 +0100 |
| commit | d96db56f03726afa3236ac04cda5d8dc0c1d1aa2 (patch) | |
| tree | 03069f470f3bc73e5945a5c92ad299ad594e52a5 /src/common/Collision/Models/ModelInstance.h | |
| parent | 5736deb8549da301cec076fba4d3c1aeedb4227a (diff) | |
Core/Tools: Fix brutal linking in mmaps extractor.
* caused warnings with shared linking
* ref #15671
(cherry picked from commit 13654bac2c41b2971915e706b5304a3ce6089a47)
Diffstat (limited to 'src/common/Collision/Models/ModelInstance.h')
| -rw-r--r-- | src/common/Collision/Models/ModelInstance.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/common/Collision/Models/ModelInstance.h b/src/common/Collision/Models/ModelInstance.h index dfdb001db0a..f8bbfa4fa73 100644 --- a/src/common/Collision/Models/ModelInstance.h +++ b/src/common/Collision/Models/ModelInstance.h @@ -70,12 +70,11 @@ namespace VMAP void intersectPoint(const G3D::Vector3& p, AreaInfo &info) const; bool GetLocationInfo(const G3D::Vector3& p, LocationInfo &info) const; bool GetLiquidLevel(const G3D::Vector3& p, LocationInfo &info, float &liqHeight) const; + WorldModel* getWorldModel() { return iModel; } protected: G3D::Matrix3 iInvRot; float iInvScale; WorldModel* iModel; - public: - WorldModel* getWorldModel(); }; } // namespace VMAP |