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

[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:
94b9d4d182 M4: RIDDLE: Fix broken animation in section8_room
a4d1210cb7 M4: RIDDLE: Fix super random crash caused by an issue in the original logic (


Commit: 94b9d4d1829239db6d5e1762ba6f6b5d51b02d0b
    https://github.com/scummvm/scummvm/commit/94b9d4d1829239db6d5e1762ba6f6b5d51b02d0b
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-10T23:45:03+01:00

Commit Message:
M4: RIDDLE: Fix broken animation in section8_room

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


diff --git a/engines/m4/riddle/rooms/section8/section8_room.cpp b/engines/m4/riddle/rooms/section8/section8_room.cpp
index f339577be94..acffd9d4699 100644
--- a/engines/m4/riddle/rooms/section8/section8_room.cpp
+++ b/engines/m4/riddle/rooms/section8/section8_room.cpp
@@ -239,6 +239,9 @@ void Section8Room::parser() {
 				break;
 
 			case 30:
+				// The original wasn't terminating the machine before starting a new, leading in a double animation during the duration of this second animation.
+				// This call has been added to fix the issue
+				terminateMachine(_ripPushMach);
 				switch (_currentRoom) {
 				case 804:
 					_ripPushMach = series_plain_play("RIP ATTEMPTS CHAR PUSH", 1, 2, 100, 0, 5, 40, true);


Commit: a4d1210cb7249e7cb60f25ae7595bb94ce62b021
    https://github.com/scummvm/scummvm/commit/a4d1210cb7249e7cb60f25ae7595bb94ce62b021
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-10T23:45:03+01:00

Commit Message:
M4: RIDDLE: Fix super random crash caused by an issue in the original logic (

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


diff --git a/engines/m4/riddle/rooms/section8/section8_room.cpp b/engines/m4/riddle/rooms/section8/section8_room.cpp
index acffd9d4699..4069030c486 100644
--- a/engines/m4/riddle/rooms/section8/section8_room.cpp
+++ b/engines/m4/riddle/rooms/section8/section8_room.cpp
@@ -870,7 +870,10 @@ void Section8Room::daemon() {
 			series_unload(_ripLooksAround);
 			series_unload(_mctdSerie);
 			_meiHandsBehindBack = series_load("MEI CHIEN HANDS BEHIND BACK", -1, nullptr);
-			setGlobals3(_mctdSerie, 17, 17);
+			// The original was calling setGlobals3 using _mctdSerie, which has just been unloaded
+			// Using the other series (often used with frame 17 in other calls) avoids the crash and improve the animation,
+			// which is a good sign it's what was supposed to be done
+			setGlobals3(_meiHandsBehindBack, 17, 17);
 			sendWSMessage_3840000(_mcTrekMach, -1);
 			kernel_timing_trigger(imath_ranged_rand(7200, 14400), 5, nullptr);
 		}