From d96db56f03726afa3236ac04cda5d8dc0c1d1aa2 Mon Sep 17 00:00:00 2001 From: Naios Date: Mon, 12 Oct 2015 14:13:50 +0200 Subject: Core/Tools: Fix brutal linking in mmaps extractor. * caused warnings with shared linking * ref #15671 (cherry picked from commit 13654bac2c41b2971915e706b5304a3ce6089a47) --- src/common/Collision/Models/ModelInstance.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/common/Collision/Models/ModelInstance.h') 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 -- cgit v1.2.3