diff options
| author | ModoX <moardox@gmail.com> | 2022-12-30 00:02:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-30 00:02:40 +0100 |
| commit | 6ce66659929cbd680a91dd5caa1a5957f30b0716 (patch) | |
| tree | 6ca6f00617cfa7a692769bb0cd9853a6665ac215 /src/common/Collision/Models/GameObjectModel.cpp | |
| parent | 659e45ad15482ceb82ddaf7ea586c8721f824ce8 (diff) | |
Core/Vmaps: Fix inconsistency of hitInstance and hitModel to cause wrong area ids (#28632)
Closes #28326
Co-authored-by: Gosha <284210+Lordron@users.noreply.github.com>
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 72a9a706bdc..43d6808e0d3 100644 --- a/src/common/Collision/Models/GameObjectModel.cpp +++ b/src/common/Collision/Models/GameObjectModel.cpp @@ -227,7 +227,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; |