From 6ce66659929cbd680a91dd5caa1a5957f30b0716 Mon Sep 17 00:00:00 2001 From: ModoX Date: Fri, 30 Dec 2022 00:02:40 +0100 Subject: 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> --- src/common/Collision/Models/GameObjectModel.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/common/Collision/Models/GameObjectModel.cpp') 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; -- cgit v1.2.3