[Scummvm-git-logs] scummvm master -> 932caf3b3d5125f2e4c7eda04365f8151623fa3f

[dreammaster]

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

Summary:
373fbe3fac M4: RIDDLE: Cleanups for room 304
83733505f5 M4: RIDDLE: Fix Mei's callback when finishing walking in room 304
932caf3b3d M4: RIDDLE: Series name fixes for room 304 cutscene


Commit: 373fbe3face1461559312a77754b8fa4613a014a
    https://github.com/scummvm/scummvm/commit/373fbe3face1461559312a77754b8fa4613a014a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-16T21:32:57-07:00

Commit Message:
M4: RIDDLE: Cleanups for room 304

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


diff --git a/engines/m4/riddle/rooms/section3/room304.cpp b/engines/m4/riddle/rooms/section3/room304.cpp
index fb8d5fd5f80..688a3aaa58a 100644
--- a/engines/m4/riddle/rooms/section3/room304.cpp
+++ b/engines/m4/riddle/rooms/section3/room304.cpp
@@ -639,7 +639,7 @@ void Room304::handlingStickAndSword() {
 		series_unload(_suit1);
 		_safe1 = series_load("rip opens safe part 1");
 		_safe2 = series_load("rip opens safe part 2");
-		ws_walk(510, 300, 0, 43, 3);
+		ws_walk(510, 300, nullptr, 43, 3);
 		digi_preload("304r51");
 		digi_play("304r51", 1, 255, 79);
 		break;
@@ -784,7 +784,7 @@ void Room304::handlingStickAndSword() {
 		break;
 
 	case 69:
-		ws_walk(458, 263, 0, -1, 2);
+		ws_walk(458, 263, nullptr, -1, 2);
 		kernel_timing_trigger(30, 678);
 		break;
 
diff --git a/engines/m4/riddle/triggers.cpp b/engines/m4/riddle/triggers.cpp
index 41f23b239e8..a499d16478c 100644
--- a/engines/m4/riddle/triggers.cpp
+++ b/engines/m4/riddle/triggers.cpp
@@ -87,12 +87,12 @@ void sendWSMessage_10000(int val1, machine *mach, int val2, int val3,
 	sendWSMessage(0x10000, 0, mach, 0, nullptr, 1);
 }
 
-void sendWSMessage_10000(machine *mach, int val1, int val2, int index, int trigger, int val4) {
+void sendWSMessage_10000(machine *mach, int destX, int destY, 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 };
 
-	_G(globals)[GLB_TEMP_1] = val1 << 16;
-	_G(globals)[GLB_TEMP_2] = val2 << 16;
-	_G(globals)[GLB_TEMP_3] = MulSF16((val2 << 16) - _G(globals)[V002], _G(globals)[V006])
+	_G(globals)[GLB_TEMP_1] = destX << 16;
+	_G(globals)[GLB_TEMP_2] = destY << 16;
+	_G(globals)[GLB_TEMP_3] = MulSF16((destY << 16) - _G(globals)[V002], _G(globals)[V006])
 		+ _G(globals)[V004];
 	_G(globals)[GLB_TEMP_4] = (index > 0 ? NUMS[index] : -1) << 16;
 	_G(globals)[GLB_TEMP_5] = kernel_trigger_create(trigger);
diff --git a/engines/m4/riddle/triggers.h b/engines/m4/riddle/triggers.h
index bc00076dd04..cca697beddb 100644
--- a/engines/m4/riddle/triggers.h
+++ b/engines/m4/riddle/triggers.h
@@ -42,7 +42,7 @@ extern void setGlobals4(int series, int val2, int val3, int val4);
 
 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 *mach, int val1, int val2, int index,
+extern void sendWSMessage_10000(machine *mach, int destX, int destY, int index,
 	int trigger, int val4);
 
 machine *triggerMachineByHash_3000(int myHash, int dataHash,


Commit: 83733505f548708f4e9dc9618403bc3436dbd0a3
    https://github.com/scummvm/scummvm/commit/83733505f548708f4e9dc9618403bc3436dbd0a3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-16T21:32:57-07:00

Commit Message:
M4: RIDDLE: Fix Mei's callback when finishing walking in room 304

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


diff --git a/engines/m4/riddle/triggers.cpp b/engines/m4/riddle/triggers.cpp
index a499d16478c..7a5866af1ed 100644
--- a/engines/m4/riddle/triggers.cpp
+++ b/engines/m4/riddle/triggers.cpp
@@ -455,7 +455,7 @@ void triggerMachineByHashCallback3000(frac16 myMessage, machine *sender) {
 
 	case 2:
 		if (param)
-			sendWSMessage(0x30000, triggerType, sender, 0, nullptr, 1);
+			sendWSMessage(0x30000, 0, sender, 0, nullptr, 1);
 		else if (msg >= 0)
 			kernel_trigger_dispatchx(myMessage);
 		break;


Commit: 932caf3b3d5125f2e4c7eda04365f8151623fa3f
    https://github.com/scummvm/scummvm/commit/932caf3b3d5125f2e4c7eda04365f8151623fa3f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-16T21:32:57-07:00

Commit Message:
M4: RIDDLE: Series name fixes for room 304 cutscene

Changed paths:
    engines/m4/riddle/rooms/section3/room304.cpp


diff --git a/engines/m4/riddle/rooms/section3/room304.cpp b/engines/m4/riddle/rooms/section3/room304.cpp
index 688a3aaa58a..9fa30a0aec6 100644
--- a/engines/m4/riddle/rooms/section3/room304.cpp
+++ b/engines/m4/riddle/rooms/section3/room304.cpp
@@ -550,7 +550,7 @@ void Room304::handlingStickAndSword() {
 	case 23:
 		terminateMachineAndNull(_headUp2);
 		series_unload(_suit2);
-		series_ranged_play("MC UNITES LF", 1, 1, 83, 98, 100, 0xf05, 7, 25);
+		series_ranged_play("MC UNTIES LF", 1, 1, 83, 98, 100, 0xf05, 7, 25);
 		digi_play("304f02", 1);
 		break;
 
@@ -595,7 +595,7 @@ void Room304::handlingStickAndSword() {
 		break;
 
 	case 33:
-		_headUp2 = series_ranged_play("fl talk 1", -1, 0, 0, 0, 100, 0x200, 250);
+		_headUp2 = series_ranged_play("lf talk 1", -1, 0, 0, 0, 100, 0x200, 250);
 		break;
 
 	case 34: