[Scummvm-git-logs] scummvm master -> d52f16f02edffdf20fe5ffac85df709228ec824a
dreammaster
noreply at scummvm.org
Tue Oct 22 04:01:19 UTC 2024
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:
d52f16f02e M4: RIDDLE: Fix params storing in sendWSMessage_10000
Commit: d52f16f02edffdf20fe5ffac85df709228ec824a
https://github.com/scummvm/scummvm/commit/d52f16f02edffdf20fe5ffac85df709228ec824a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-21T21:00:34-07:00
Commit Message:
M4: RIDDLE: Fix params storing in sendWSMessage_10000
Changed paths:
engines/m4/riddle/triggers.cpp
diff --git a/engines/m4/riddle/triggers.cpp b/engines/m4/riddle/triggers.cpp
index d77878d2466..8a51d9e4b49 100644
--- a/engines/m4/riddle/triggers.cpp
+++ b/engines/m4/riddle/triggers.cpp
@@ -90,20 +90,20 @@ machine *triggerMachineByHash_3000(int myHash, int dataHash, int normalDir, int
return result;
}
-void sendWSMessage_10000(int val1, machine *mach, int val2, int val3,
- int val4, int trigger, int val9, int val6, int val7, int val8) {
+void sendWSMessage_10000(int val1, machine *mach, int series1, int val3,
+ int val4, int trigger, int series2, int val6, int val7, int val8) {
if (!trigger)
trigger = -1;
_G(globals)[GLB_TEMP_1] = val1 << 16;
- _G(globals)[GLB_TEMP_2] = val2 << 16;
+ _G(globals)[GLB_TEMP_2] = series1 << 24;
_G(globals)[GLB_TEMP_3] = val3 << 16;
_G(globals)[GLB_TEMP_4] = val4 << 16;
_G(globals)[GLB_TEMP_5] = kernel_trigger_create(trigger);
_G(globals)[GLB_TEMP_6] = val6 << 16;
_G(globals)[GLB_TEMP_7] = val7 << 16;
_G(globals)[GLB_TEMP_8] = val8 << 16;
- _G(globals)[GLB_TEMP_9] = val9 << 24;
+ _G(globals)[GLB_TEMP_9] = series2 << 24;
sendWSMessage(STARTWALK << 16, 0, mach, 0, nullptr, 1);
}
More information about the Scummvm-git-logs
mailing list