[Scummvm-git-logs] scummvm master -> 1419bb49c923b8fb8d2f4ff6e72a01bc7b59d889

[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:
1419bb49c9 M4: RIDDLE: Fix for bug #16062 in room 610: Soft lock when walking directly to the interrogating of Twelvetrees


Commit: 1419bb49c923b8fb8d2f4ff6e72a01bc7b59d889
    https://github.com/scummvm/scummvm/commit/1419bb49c923b8fb8d2f4ff6e72a01bc7b59d889
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-07-03T05:02:27+01:00

Commit Message:
M4: RIDDLE: Fix for bug #16062 in room 610: Soft lock when walking directly to the interrogating of Twelvetrees

Changed paths:
    engines/m4/riddle/rooms/section6/room610.cpp


diff --git a/engines/m4/riddle/rooms/section6/room610.cpp b/engines/m4/riddle/rooms/section6/room610.cpp
index 1197dda7e62..d10abc8e1d0 100644
--- a/engines/m4/riddle/rooms/section6/room610.cpp
+++ b/engines/m4/riddle/rooms/section6/room610.cpp
@@ -365,7 +365,10 @@ void Room610::daemon() {
 		break;
 
 	case 401:
-		switch (_kShould) {
+		if (_kShould)
+			break;
+		
+		switch (_val5) {
 		case 0:
 			sendWSMessage_10000(1, _k, _k00, 54, 54, 400, _k00, 54, 54, 0);
 			break;
@@ -743,7 +746,7 @@ void Room610::daemonPostprocess() {
 				!player_said("talk to", "SAMANTHA") &&
 				_G(player_info).x <= 222) {
 			intr_cancel_sentence();
-			ws_walk(_G(my_walker), 202, 244, nullptr, 666, 11);
+			ws_walk(_G(my_walker), 202, 244, nullptr, 666, 11, true);
 			_flag1 = true;
 			_val5 = 2;
 			_sgShould = 4;