From 53b4501ce9b072cfffe7de7f348094f443e36950 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 28 Nov 2024 17:08:56 +0100 Subject: Core/Vmaps: Don't ignore model rotation when calculating liquid level Closes #30205 --- src/common/Collision/Models/ModelInstance.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/common/Collision/Models/ModelInstance.cpp') diff --git a/src/common/Collision/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp index fb4aa97749f..d5da48a610e 100644 --- a/src/common/Collision/Models/ModelInstance.cpp +++ b/src/common/Collision/Models/ModelInstance.cpp @@ -112,8 +112,7 @@ namespace VMAP if (info.hitModel->GetLiquidLevel(pModel, zDist)) { // calculate world height (zDist in model coords): - // assume WMO not tilted (wouldn't make much sense anyway) - liqHeight = zDist * iScale + iPos.z; + liqHeight = (Vector3(pModel.x, pModel.y, zDist) * iInvRot * iScale + iPos).z; return true; } return false; -- cgit v1.2.3