From a70e758ba5eef1e8aa966cbabaee020630d2c872 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 6 Mar 2024 00:04:19 +0100 Subject: Tools/vmap_extractor: Move information about model type from spawns in vmap tiles to model file itself --- src/common/Collision/Models/GameObjectModel.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/common/Collision/Models/GameObjectModel.h') diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h index a84fac60aa2..fd11e5c1909 100644 --- a/src/common/Collision/Models/GameObjectModel.h +++ b/src/common/Collision/Models/GameObjectModel.h @@ -60,7 +60,7 @@ public: class TC_COMMON_API GameObjectModel /*, public Intersectable*/ { - GameObjectModel() : _collisionEnabled(false), iInvScale(0), iScale(0), iModel(nullptr), isWmo(false) { } + GameObjectModel() : _collisionEnabled(false), iInvScale(0), iScale(0), iModel(nullptr) { } public: const G3D::AABox& getBounds() const { return iBound; } @@ -71,7 +71,7 @@ public: /* Enables/disables collision */ void enableCollision(bool enable) { _collisionEnabled = enable; } bool isCollisionEnabled() const { return _collisionEnabled; } - bool isMapObject() const { return isWmo; } + bool isMapObject() const; uint8 GetNameSetId() const { return owner->GetNameSetId(); } bool intersectRay(G3D::Ray const& ray, float& maxDist, bool stopAtFirstHit, PhaseShift const& phaseShift, VMAP::ModelIgnoreFlags ignoreFlags) const; @@ -94,7 +94,6 @@ private: float iScale; VMAP::WorldModel* iModel; std::unique_ptr owner; - bool isWmo; }; TC_COMMON_API bool LoadGameObjectModelList(std::string const& dataPath); -- cgit v1.2.3