[Scummvm-git-logs] scummvm master -> 46772ee5cedc0e9673ca969f1a5d4879e83b0aa0

[aquadran]

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

Summary:
46772ee5ce WINTERMUTE: Sync getBonePosition3D() with original code


Commit: 46772ee5cedc0e9673ca969f1a5d4879e83b0aa0
    https://github.com/scummvm/scummvm/commit/46772ee5cedc0e9673ca969f1a5d4879e83b0aa0
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-19T14:53:59+02:00

Commit Message:
WINTERMUTE: Sync getBonePosition3D() with original code

Changed paths:
    engines/wintermute/ad/ad_object_3d.cpp
    engines/wintermute/base/gfx/xmath.cpp


diff --git a/engines/wintermute/ad/ad_object_3d.cpp b/engines/wintermute/ad/ad_object_3d.cpp
index 9fd095c6a5c..aad9810cff6 100644
--- a/engines/wintermute/ad/ad_object_3d.cpp
+++ b/engines/wintermute/ad/ad_object_3d.cpp
@@ -640,6 +640,11 @@ bool AdObject3D::getBonePosition3D(const char *boneName, DXVector3 *pos, DXVecto
 		return false;
 	}
 
+	DXVector3 vz(0, 0, 0);
+	if (!offset) {
+		offset = &vz;
+	}
+
 	DXMatrix bonePosMat;
 	DXMatrixMultiply(&bonePosMat, boneMat, &_worldMatrix);
 
diff --git a/engines/wintermute/base/gfx/xmath.cpp b/engines/wintermute/base/gfx/xmath.cpp
index 5722a4e8956..5547b76b8b1 100644
--- a/engines/wintermute/base/gfx/xmath.cpp
+++ b/engines/wintermute/base/gfx/xmath.cpp
@@ -486,11 +486,6 @@ float DXQuaternionDot(const DXVector4 *pq1, const DXVector4 *pq2) {
 
 DXVector4 *DXVec3Transform(DXVector4 *pout, const DXVector3 *pv, const DXMatrix *pm) {
 	DXVector4 out;
-	DXVector3 vz(0, 0, 0);
-
-	if (!pv) {
-		pv = &vz;
-	}
 
 	out._x = pm->_m[0][0] * pv->_x + pm->_m[1][0] * pv->_y + pm->_m[2][0] * pv->_z + pm->_m[3][0];
 	out._y = pm->_m[0][1] * pv->_x + pm->_m[1][1] * pv->_y + pm->_m[2][1] * pv->_z + pm->_m[3][1];