diff options
| author | ModoX <moardox@gmail.com> | 2022-12-30 00:02:40 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-11-18 22:39:04 +0100 |
| commit | 225a1bbf7dabdc318bd340e15afa7378a7622612 (patch) | |
| tree | 42edee4ba164b829e7585760af97347786f66ce7 /src/common/Collision/Models/GameObjectModel.cpp | |
| parent | cf27f1cf39c4ba3fb644f0a0e8659e90ff935fac (diff) | |
Core/Vmaps: Fix inconsistency of hitInstance and hitModel to cause wrong area ids (#28632)
Closes #19761
Closes #28326
Co-authored-by: Gosha <284210+Lordron@users.noreply.github.com>
(cherry picked from commit 6ce66659929cbd680a91dd5caa1a5957f30b0716)
Diffstat (limited to 'src/common/Collision/Models/GameObjectModel.cpp')
| -rw-r--r-- | src/common/Collision/Models/GameObjectModel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/Collision/Models/GameObjectModel.cpp b/src/common/Collision/Models/GameObjectModel.cpp index 23735f2d8e5..88357333e6b 100644 --- a/src/common/Collision/Models/GameObjectModel.cpp +++ b/src/common/Collision/Models/GameObjectModel.cpp @@ -216,7 +216,9 @@ bool GameObjectModel::GetLocationInfo(G3D::Vector3 const& point, VMAP::LocationI Vector3 pModel = iInvRot * (point - iPos) * iInvScale; Vector3 zDirModel = iInvRot * Vector3(0.f, 0.f, -1.f); float zDist; - if (iModel->GetLocationInfo(pModel, zDirModel, zDist, info)) + + VMAP::GroupLocationInfo groupInfo; + if (iModel->GetLocationInfo(pModel, zDirModel, zDist, groupInfo)) { Vector3 modelGround = pModel + zDist * zDirModel; float world_Z = ((modelGround * iInvRot) * iScale + iPos).z; |