[Scummvm-git-logs] scummvm master -> 51539435f14aec03c8b26706cfd6875df3dd13a1

[Strangerke]

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

Summary:
68836b9ea4 M4: RIDDLE: Fix dialog with monk #7 and 8 not starting in room 704
51539435f1 M4: RIDDLE: Fix blocker when talking to monk #12 in room 705


Commit: 68836b9ea4c242e49d4ccaafb2d60ae9414568d3
    https://github.com/scummvm/scummvm/commit/68836b9ea4c242e49d4ccaafb2d60ae9414568d3
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-06T10:35:14+01:00

Commit Message:
M4: RIDDLE: Fix dialog with monk #7 and 8 not starting in room 704

Changed paths:
    engines/m4/riddle/rooms/section7/room704.cpp


diff --git a/engines/m4/riddle/rooms/section7/room704.cpp b/engines/m4/riddle/rooms/section7/room704.cpp
index 33f09bba91e..e17daf7eb62 100644
--- a/engines/m4/riddle/rooms/section7/room704.cpp
+++ b/engines/m4/riddle/rooms/section7/room704.cpp
@@ -265,7 +265,7 @@ void Room704::parser() {
 
 	else if (talkFl && player_said("MONK #7")) {
 		switch (_G(kernel).trigger) {
-		case 1:
+		case -1:
 			player_set_commands_allowed(false);
 			digi_play("com081", 1, 255, 2, -1);
 			break;
@@ -302,7 +302,7 @@ void Room704::parser() {
 
 	else if (talkFl && player_said("MONK #8")) {
 		switch (_G(kernel).trigger) {
-		case 1:
+		case -1:
 			player_set_commands_allowed(false);
 			digi_play("com081", 1, 255, 2, -1);
 			break;


Commit: 51539435f14aec03c8b26706cfd6875df3dd13a1
    https://github.com/scummvm/scummvm/commit/51539435f14aec03c8b26706cfd6875df3dd13a1
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-06T10:36:31+01:00

Commit Message:
M4: RIDDLE: Fix blocker when talking to monk #12 in room 705

Changed paths:
    engines/m4/riddle/rooms/section7/room705.cpp


diff --git a/engines/m4/riddle/rooms/section7/room705.cpp b/engines/m4/riddle/rooms/section7/room705.cpp
index c8b8e5d10ff..7eac288ddf7 100644
--- a/engines/m4/riddle/rooms/section7/room705.cpp
+++ b/engines/m4/riddle/rooms/section7/room705.cpp
@@ -384,7 +384,7 @@ void Room705::parser() {
 			_field60_mode = 134;
 			_field64_should = 135;
 			_G(kernel).trigger_mode = KT_DAEMON;
-			kernel_timing_trigger(10, 177, nullptr);
+			kernel_timing_trigger(10, 137, nullptr);
 			_G(kernel).trigger_mode = KT_PARSE;
 
 			break;