[Scummvm-git-logs] scummvm master -> 474bae09513d2f6d84369f9739fe2ff602618d24

Strangerke noreply at scummvm.org
Tue Mar 11 20:40:27 UTC 2025


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:
474bae0951 M4: RIDDLE: Fix 2 blockers in room 401 (when sending the turtle) + a bug (when talking for the first time about the cast


Commit: 474bae09513d2f6d84369f9739fe2ff602618d24
    https://github.com/scummvm/scummvm/commit/474bae09513d2f6d84369f9739fe2ff602618d24
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-11T21:39:51+01:00

Commit Message:
M4: RIDDLE: Fix 2 blockers in room 401 (when sending the turtle) + a bug (when talking for the first time about the castle)

Changed paths:
    engines/m4/riddle/rooms/section4/room401.cpp


diff --git a/engines/m4/riddle/rooms/section4/room401.cpp b/engines/m4/riddle/rooms/section4/room401.cpp
index 841b6e284ee..442ad6269ba 100644
--- a/engines/m4/riddle/rooms/section4/room401.cpp
+++ b/engines/m4/riddle/rooms/section4/room401.cpp
@@ -611,7 +611,7 @@ void Room401::daemon() {
 		}
 		break;
 
-	case 711:
+	case 712:
 		sendWSMessage_10000(1, _agent, _401a01, 3, 3, -1, _401a01, 3, 3, 0);
 		kernel_timing_trigger(1, 715);
 		break;
@@ -632,10 +632,13 @@ void Room401::daemon() {
 		sendWSMessage_10000(1, _agent, _401a01, 1, 1, 100, _401a01, 1, 1, 0);
 		inv_move_object("TURTLE", 305);
 		inv_move_object("TURTLE TREATS", 305);
-
+		_G(flags[V091]) = 1;
+		
 		_ripMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
 			triggerMachineByHashCallback, "rip");
 		sendWSMessage_10000(1, _ripMach, _401rp01, 11, 1, 720, _401rp01, 1, 1, 0);
+
+		_agentShould = 0;
 		_ctr1 = 0;
 		break;
 
@@ -758,7 +761,7 @@ void Room401::daemon() {
 		break;
 
 	case 1000:
-		if (_G(flags)[V020]) {
+		if (!_G(flags)[V020]) {
 			kernel_timing_trigger(30, 400);
 		} else if (_G(flags)[V110] && !_G(flags)[V016]) {
 			kernel_timing_trigger(30, 500);




More information about the Scummvm-git-logs mailing list