[Scummvm-git-logs] scummvm master -> 7b4bdb89edbd992d7b0d9860054feaaa834681e3

[Strangerke]

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

Summary:
7b4bdb89ed M4: RIDDLE: Fix an unreported bug in the hardcoded logic of room 407


Commit: 7b4bdb89edbd992d7b0d9860054feaaa834681e3
    https://github.com/scummvm/scummvm/commit/7b4bdb89edbd992d7b0d9860054feaaa834681e3
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-25T12:02:08+01:00

Commit Message:
M4: RIDDLE: Fix an unreported bug in the hardcoded logic of room 407

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


diff --git a/engines/m4/riddle/rooms/section4/room407.cpp b/engines/m4/riddle/rooms/section4/room407.cpp
index 774478233ad..687a6c1edf7 100644
--- a/engines/m4/riddle/rooms/section4/room407.cpp
+++ b/engines/m4/riddle/rooms/section4/room407.cpp
@@ -351,7 +351,7 @@ void Room407::init() {
 				_G(kernel).trigger_mode = KT_PARSE;
 			} else if (_tubeState == 1130) {
 				_G(kernel).trigger_mode = KT_DAEMON;
-				kernel_timing_trigger(1, 410);
+				kernel_timing_trigger(1, 420);
 				_G(kernel).trigger_mode = KT_PARSE;
 			}
 		}
@@ -925,7 +925,7 @@ void Room407::daemon() {
 		terminateMachineAndNull(_bottle);
 
 		_407r = series_load("407r");
-		_bottle = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0xe00, 0,
+		_bottle = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0xe00, false,
 			triggerMachineByHashCallback, "GLASS JAR TURNS");
 		sendWSMessage_10000(1, _bottle, _407r, 1, 30, 186, _407r, 30, 30, 0);
 		digi_play("407_s16", 3);
@@ -3437,6 +3437,7 @@ void Room407::faucetPipeGlassJar() {
 
 void Room407::gardenHoseFaucetPipe() {
 	switch (_G(kernel).trigger) {
+
 	case 1:
 		_drawerPopupHose = series_place_sprite(
 			"407 HOSE HANG FROM JAR", 0, 0, 0, 100, 0xb00);
@@ -3477,6 +3478,7 @@ void Room407::gardenHoseFaucetPipe() {
 		break;
 
 	default:
+		warning("gardenHoseFaucetPipe - Unhandled trigger %d", _G(kernel).trigger);
 		break;
 	}
 }