[Scummvm-git-logs] scummvm master -> 33edd61739adf6a894d498877908928fb8f58625

[dreammaster]

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:
33edd61739 M4: RIDDLE: Fix calculating sprite scales in triggerMachineByHash_3000


Commit: 33edd61739adf6a894d498877908928fb8f58625
    https://github.com/scummvm/scummvm/commit/33edd61739adf6a894d498877908928fb8f58625
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-15T22:14:42-07:00

Commit Message:
M4: RIDDLE: Fix calculating sprite scales in triggerMachineByHash_3000

Changed paths:
    engines/m4/riddle/triggers.cpp


diff --git a/engines/m4/riddle/triggers.cpp b/engines/m4/riddle/triggers.cpp
index 68c1ec9ce38..7aa8f509fb9 100644
--- a/engines/m4/riddle/triggers.cpp
+++ b/engines/m4/riddle/triggers.cpp
@@ -22,6 +22,7 @@
 #include "m4/riddle/triggers.h"
 #include "m4/riddle/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 #include "m4/graphics/gr_series.h"
 
 namespace M4 {
@@ -110,8 +111,8 @@ machine *triggerMachineByHash_3000(int myHash, int dataHash, int normalDir, int
 	_G(globals)[GLB_TEMP_3] = shadowDir << 24;
 	_G(globals)[GLB_TEMP_4] = param1 << 16;
 	_G(globals)[GLB_TEMP_5] = param2 << 16;
-	_G(globals)[GLB_TEMP_6] = ((param2 << 16) - _G(globals)[V002])
-		* _G(globals)[V006] + _G(globals)[V004];
+	_G(globals)[GLB_TEMP_6] = MulSF16((param2 << 16) - _G(globals)[V002],
+		_G(globals)[V006]) + _G(globals)[V004];
 	_G(globals)[GLB_TEMP_7] = NUMS[index] << 16;
 
 	machine *result = TriggerMachineByHash(myHash, nullptr, dataHash + 8, 0,