[Scummvm-git-logs] scummvm master -> 117b2231b8471d17009e9e7bf45602f73b67f639

[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:
117b2231b8 M4: RIDDLE: Fix display of Mei in room 303


Commit: 117b2231b8471d17009e9e7bf45602f73b67f639
    https://github.com/scummvm/scummvm/commit/117b2231b8471d17009e9e7bf45602f73b67f639
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-12T11:31:44-07:00

Commit Message:
M4: RIDDLE: Fix display of Mei in room 303

Changed paths:
    engines/m4/riddle/rooms/section3/room303.cpp
    engines/m4/riddle/triggers.cpp
    engines/m4/riddle/triggers.h


diff --git a/engines/m4/riddle/rooms/section3/room303.cpp b/engines/m4/riddle/rooms/section3/room303.cpp
index ae96d8f068f..bd86c017883 100644
--- a/engines/m4/riddle/rooms/section3/room303.cpp
+++ b/engines/m4/riddle/rooms/section3/room303.cpp
@@ -1739,8 +1739,7 @@ void Room303::setupMei() {
 		triggerMachineByHashCallbackNegative, "mc");
 
 	_G(kernel).trigger_mode = KT_DAEMON;
-	sendWSMessage_10000(1, _mei, _mei1, 1, 1, 200,
-		_mei1, 1, 1, 0);
+	sendWSMessage_10000(1, _mei, _mei1, 1, 1, 200, _mei1, 1, 1, 0);
 	_val10 = _val11 = 0;
 }
 
diff --git a/engines/m4/riddle/triggers.cpp b/engines/m4/riddle/triggers.cpp
index 16cf4712de0..74e1903667d 100644
--- a/engines/m4/riddle/triggers.cpp
+++ b/engines/m4/riddle/triggers.cpp
@@ -68,8 +68,8 @@ void setGlobals4(int val1, int val2, int val3, int val4) {
 	_G(globals)[GLB_TEMP_4] = val4;
 }
 
-void sendWSMessage_10000(int val1, machine *recv, int val2, int val3,
-	int val4, int trigger, int val9, int val6, int val7, int val8) {
+void sendWSMessage_10000(int val1, machine *mach, int val2, int val3,
+		int val4, int trigger, int val9, int val6, int val7, int val8) {
 	if (!trigger)
 		trigger = -1;
 
@@ -83,11 +83,10 @@ void sendWSMessage_10000(int val1, machine *recv, int val2, int val3,
 	_G(globals)[GLB_TEMP_8] = val8 << 16;
 	_G(globals)[GLB_TEMP_9] = val9 << 24;
 
-	sendWSMessage(0x10000, 0, nullptr, 0, nullptr, 1);
+	sendWSMessage(0x10000, 0, mach, 0, nullptr, 1);
 }
 
-void sendWSMessage_10000(machine *recv, int val1, int val2, int index,
-		int trigger, int val4) {
+void sendWSMessage_10000(machine *mach, int val1, int val2, int index, int trigger, int val4) {
 	static const byte NUMS[14] = { 0, 0, 1, 2, 3, 4, 4, 5, 6, 7, 8, 9, 9, 0 };
 
 	int val = ((val2 << 16) - _G(globals)[V002]) *_G(globals)[V006] + _G(globals)[V004];
@@ -99,7 +98,7 @@ void sendWSMessage_10000(machine *recv, int val1, int val2, int index,
 	_G(globals)[GLB_TEMP_5] = kernel_trigger_create(trigger);
 	_G(globals)[GLB_TEMP_6] = val4 << 16;
 
-	sendWSMessage(0x10000, 0, recv, 0, nullptr, 1);
+	sendWSMessage(0x10000, 0, mach, 0, nullptr, 1);
 }
 
 machine *triggerMachineByHash_3000(int myHash, int dataHash, int normalDir, int shadowDir,
diff --git a/engines/m4/riddle/triggers.h b/engines/m4/riddle/triggers.h
index 468a19162ed..7615fb37c5b 100644
--- a/engines/m4/riddle/triggers.h
+++ b/engines/m4/riddle/triggers.h
@@ -40,9 +40,9 @@ extern void setGlobals1(int val1, int val2, int val3, int val4, int val5,
 extern void setGlobals3(int series, int val1, int val2);
 extern void setGlobals4(int val1, int val2, int val3, int val4);
 
-extern void sendWSMessage_10000(int val1, machine *recv, int val2, int val3,
+extern void sendWSMessage_10000(int val1, machine *mach, int val2, int val3,
 	int val4, int trigger, int val9, int val6, int val7, int val8);
-extern void sendWSMessage_10000(machine *recv, int val1, int val2, int index,
+extern void sendWSMessage_10000(machine *mach, int val1, int val2, int index,
 	int trigger, int val4);
 
 machine *triggerMachineByHash_3000(int myHash, int dataHash,