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

[Strangerke]

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:
bda84cd1f5 M4: RIDDLE: Fix another issue in room 402


Commit: bda84cd1f5bf83c128447c6c2be22bb3d14e088f
    https://github.com/scummvm/scummvm/commit/bda84cd1f5bf83c128447c6c2be22bb3d14e088f
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-07T10:18:27+01:00

Commit Message:
M4: RIDDLE: Fix another issue in room 402

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


diff --git a/engines/m4/riddle/rooms/section4/room402.cpp b/engines/m4/riddle/rooms/section4/room402.cpp
index 224f53cdf1d..6684dab325f 100644
--- a/engines/m4/riddle/rooms/section4/room402.cpp
+++ b/engines/m4/riddle/rooms/section4/room402.cpp
@@ -274,7 +274,7 @@ void Room402::init() {
 
 void Room402::daemon() {
 	int frame;
-	
+
 	switch (_G(kernel).trigger) {
 	case 19:
 		ws_walk(_G(my_walker), 449, 317, nullptr, 20, 3);
@@ -338,7 +338,8 @@ void Room402::daemon() {
 		break;
 
 	case 30:
-		setGlobals1(_ripTalker, 0, 0, 1, 1, 0, 1, 5, 1, 5, 1);
+		midi_stop();
+		setGlobals1(_ripTalker, 1, 1, 1, 1, 0, 1, 5, 1, 5, 1);
 		sendWSMessage_110000(32);
 		break;
 
@@ -1414,9 +1415,7 @@ void Room402::pre_parser() {
 	if (player_said("DANZIG") && !player_said("ENTER", "DANZIG"))
 		_G(player).resetWalk();
 
-	if (!_G(flags)[V112] && !player_said("WALK TO") &&
-		(!talkFlag || !player_said("WOLF")) &&
-		!player_said("POMERANIAN MARKS", "WOLF"))
+	if (!_G(flags)[V112] && !player_said("WALK TO") && !(talkFlag  && player_said("WOLF")) && !player_said("POMERANIAN MARKS", "WOLF"))
 		_G(flags)[V112] = 1;
 
 	if (_val6 == 0)