[Scummvm-git-logs] scummvm master -> 97cd6adeacbfe24c6d7e7bf5ce5ad852c72908da

aquadran noreply at scummvm.org
Thu Nov 12 05:18:17 UTC 2026


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
97cd6adeac EMI: Fix the stove lever in the Lua Bar kitchen


Commit: 97cd6adeacbfe24c6d7e7bf5ce5ad852c72908da
    https://github.com/scummvm/scummvm/commit/97cd6adeacbfe24c6d7e7bf5ce5ad852c72908da
Author: Joel Teichroeb (joel at teichroeb.net)
Date: 2026-11-12T06:18:13+01:00

Commit Message:
EMI: Fix the stove lever in the Lua Bar kitchen

Once an animation has a track for the joint, its position comes from the
translation tracks alone, starting from the origin. The kitchen lever's rotate
bone has rotation tracks only, so it loses its bind translation, which put
the lever in front of the stove here.

Fixes bug #11794.

Changed paths:
    engines/grim/emi/skeleton.cpp


diff --git a/engines/grim/emi/skeleton.cpp b/engines/grim/emi/skeleton.cpp
index c6882a4b47e..76dcc13b9d6 100644
--- a/engines/grim/emi/skeleton.cpp
+++ b/engines/grim/emi/skeleton.cpp
@@ -159,6 +159,11 @@ void Skeleton::animate() {
 			if (remainingRotWeight <= 0.0f && remainingTransWeight <= 0.0f)
 				break;
 		}
+
+		if (remainingTransWeight > 0.0f && (remainingRotWeight < 1.0f || remainingTransWeight < 1.0f)) {
+			Math::Vector3d pos = _joints[i]._animMatrix.getPosition();
+			_joints[i]._animMatrix.setPosition(pos - _joints[i]._relMatrix.getPosition() * remainingTransWeight);
+		}
 	}
 
 	commitAnim();




More information about the Scummvm-git-logs mailing list