aboutsummaryrefslogtreecommitdiff
path: root/src/common/Collision/Models/GameObjectModel.h
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-03-06 00:04:19 +0100
committerShauren <shauren.trinity@gmail.com>2024-03-06 00:04:19 +0100
commita70e758ba5eef1e8aa966cbabaee020630d2c872 (patch)
treef323c8ac0f4bb31d75c3570b838de066190983ba /src/common/Collision/Models/GameObjectModel.h
parent382e76f02df5a41c2ba1d964ac6d9258e68265e6 (diff)
Tools/vmap_extractor: Move information about model type from spawns in vmap tiles to model file itself
Diffstat (limited to 'src/common/Collision/Models/GameObjectModel.h')
-rw-r--r--src/common/Collision/Models/GameObjectModel.h5
1 files changed, 2 insertions, 3 deletions
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<GameObjectModelOwnerBase> owner;
- bool isWmo;
};
TC_COMMON_API bool LoadGameObjectModelList(std::string const& dataPath);