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

[Strangerke]

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

Summary:
64807e3d43 M4: RIDDLE: Fix glitch in animation in room 860 (Ripley walker reappearing when Mei talks)
f06355b185 M4: RIDDLE: Fix walk animation in room 810 (bug #15905)


Commit: 64807e3d43f40340eedb78b3aea9a807d5ba4509
    https://github.com/scummvm/scummvm/commit/64807e3d43f40340eedb78b3aea9a807d5ba4509
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-29T06:32:21+01:00

Commit Message:
M4: RIDDLE: Fix glitch in animation in room 860 (Ripley walker reappearing when Mei talks)

Changed paths:
    engines/m4/riddle/rooms/section8/room860.cpp


diff --git a/engines/m4/riddle/rooms/section8/room860.cpp b/engines/m4/riddle/rooms/section8/room860.cpp
index bebc817dbcb..260d5558655 100644
--- a/engines/m4/riddle/rooms/section8/room860.cpp
+++ b/engines/m4/riddle/rooms/section8/room860.cpp
@@ -79,13 +79,13 @@ void Room860::daemon() {
 		break;
 
 	case 2:
+		series_unload(_860RipWalkSeries);
 		sendWSMessage_10000(1, _860McMach, _860MeiTalkSeries, 1, 1, -1,
 			_860MeiTalkSeries, 1, 11, 4);
 		digi_play("860m01", 2, 255, 3, 860);
 		break;
 
 	case 3:
-		series_unload(_860RipWalkSeries);
 		sendWSMessage_10000(1, _860McMach, _860MeiTalkSeries, 11, 11, -1,
 			_860MeiTalkSeries, 11, 11, 0);
 		sendWSMessage_10000(1, _860RipMach, _860RipTalkSeries, 1, 2, -1,


Commit: f06355b18558deb582fa84fe45097049ad64fe46
    https://github.com/scummvm/scummvm/commit/f06355b18558deb582fa84fe45097049ad64fe46
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-29T06:35:26+01:00

Commit Message:
M4: RIDDLE: Fix walk animation in room 810 (bug #15905)

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


diff --git a/engines/m4/riddle/triggers.cpp b/engines/m4/riddle/triggers.cpp
index 8459ba4fad0..b7f4be6a9bf 100644
--- a/engines/m4/riddle/triggers.cpp
+++ b/engines/m4/riddle/triggers.cpp
@@ -314,7 +314,7 @@ void sendWSMessage_3840000(machine *machine, int32 trigger) {
 }
 
 void sendWSMessage_3860000(machine *mach, int32 trigger) {
-	_G(globals[GLB_TEMP_1]) = kernel_trigger_create(trigger);
+	_G(globals[GLB_TEMP_1]) = kernel_trigger_create(trigger) << 16;
 	sendWSMessage(ACTION_902 << 16, 0, mach, 0, nullptr, 1);
 }