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

[dreammaster]

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:
c7bfb0aa66 M4: RIDDLE: Fixes for room 405 conversation cutscene


Commit: c7bfb0aa6641a35535cda5c8e4e93e8511f9f272
    https://github.com/scummvm/scummvm/commit/c7bfb0aa6641a35535cda5c8e4e93e8511f9f272
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-14T21:32:01-08:00

Commit Message:
M4: RIDDLE: Fixes for room 405 conversation cutscene

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


diff --git a/engines/m4/riddle/rooms/section4/room405.cpp b/engines/m4/riddle/rooms/section4/room405.cpp
index b6219ab4223..90c0bea44a6 100644
--- a/engines/m4/riddle/rooms/section4/room405.cpp
+++ b/engines/m4/riddle/rooms/section4/room405.cpp
@@ -137,8 +137,9 @@ void Room405::daemon() {
 
 	case 22:
 		ws_demand_location(286, 324, 7);
-		ws_hide_walker();
+		ws_hide_walker(_baron);
 		sendWSMessage_150000(-1);
+		ws_hide_walker(_G(my_walker));
 		_baronWalker = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, -53, 100, 0x600, 0,
 			triggerMachineByHashCallback, "BARON talks rip");
 		sendWSMessage_10000(1, _baronWalker, _baronShakeSit, 1, 48, 23,
@@ -202,6 +203,7 @@ void Room405::daemon() {
 	case 31:
 		sendWSMessage_10000(1, _ripTalksBaron, _ripHandLetter, 30, 84, -1,
 			_ripHandLetter, 84, 84, 0);
+		kernel_timing_trigger(45, 32);
 		break;
 
 	case 32:
@@ -525,6 +527,7 @@ void Room405::daemon() {
 				sendWSMessage_10000(1, _baronWalker, _baronLeanForward, 11, 11, 111,
 					_baronLeanForward, 11, 11, 0);
 				_val8 = 2162;
+				conv_resume();
 				break;
 
 			case 2150:
@@ -782,14 +785,18 @@ void Room405::conv405a() {
 				if (entry == 1) {
 					_val6 = 1230;
 					_sound2 = sound;
-				} else if (entry == 5) {
-					_val8 = 2171;
+				} else {
+					if (entry == 5)
+						_val8 = 2171;
+
 					_val6 = 1102;
 					digi_play(sound, 1, 255, 1);
 				}
 				break;
 
 			default:
+				_val6 = 1102;
+				digi_play(sound, 1, 255, 1);
 				break;
 			}
 		}