[Scummvm-git-logs] scummvm master -> df3fc2c2ffaa9149a53cf340b0c3c8dadcdcdccc

[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:
df3fc2c2ff M4: RIDDLE: Further sendWSMessage param fix


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

Commit Message:
M4: RIDDLE: Further sendWSMessage param fix

Changed paths:
    engines/m4/wscript/ws_machine.cpp
    engines/m4/wscript/ws_machine.h


diff --git a/engines/m4/wscript/ws_machine.cpp b/engines/m4/wscript/ws_machine.cpp
index 292c9f471ff..35a66c4ca72 100644
--- a/engines/m4/wscript/ws_machine.cpp
+++ b/engines/m4/wscript/ws_machine.cpp
@@ -1284,20 +1284,20 @@ void sendWSMessage(uint32 msgHash, frac16 msgValue, machine *recvM,
 	}
 }
 
-void sendWSMessage(int32 val1, machine *recv, int32 val2, int32 val3, int32 val4,
-	int32 trigger, int32 val5, int32 val6, int32 val7, int32 val8) {
+void sendWSMessage(int32 val1, machine *recv, int32 series1, int32 val3, int32 val4,
+	int32 trigger, int32 series2, int32 val6, int32 val7, int32 val8) {
 	if (!trigger)
 		trigger = -1;
 
 	_G(globals)[GLB_TEMP_1] = val1 << 16;
-	_G(globals)[GLB_TEMP_2] = val2 << 24;
+	_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] = val5 << 16;
+	_G(globals)[GLB_TEMP_9] = series2 << 24;
 
 	sendWSMessage(0x10000, 0, recv, 0, nullptr, 1);
 }
diff --git a/engines/m4/wscript/ws_machine.h b/engines/m4/wscript/ws_machine.h
index ccce4ca72ac..daad9288d1b 100644
--- a/engines/m4/wscript/ws_machine.h
+++ b/engines/m4/wscript/ws_machine.h
@@ -209,8 +209,8 @@ machine *TriggerMachineByHash(MessageCB intrMsg, const char *machName);
  */
 void sendWSMessage(uint32 msgHash, frac16 msgValue, machine *recvM,
 	uint32 machHash, machine *sendM, int32 msgCount);
-void sendWSMessage(int32 val1, machine *recv, int32 val2, int32 val3, int32 val4,
-	int32 trigger, int32 val5, int32 val6, int32 val7, int32 val8);
+void sendWSMessage(int32 val1, machine *recv, int32 series1, int32 val3, int32 val4,
+	int32 trigger, int32 series2, int32 val6, int32 val7, int32 val8);
 
 #define kernel_spawn_machine(name,hash,callback) TriggerMachineByHash(hash, nullptr, -1, -1, callback, false, name)
 #define kernel_terminate_machine(m) terminateMachine(m)