[Scummvm-git-logs] scummvm master -> 64700898ba917f11cce886e4546b00e2b65e377d

[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:
64700898ba M4: RIDDLE: Fix 3 issues in room 402, conv still not giving back control


Commit: 64700898ba917f11cce886e4546b00e2b65e377d
    https://github.com/scummvm/scummvm/commit/64700898ba917f11cce886e4546b00e2b65e377d
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-06T22:23:34+01:00

Commit Message:
M4: RIDDLE: Fix 3 issues in room 402, conv still not giving back control

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 5588edb76fd..44db71e74b6 100644
--- a/engines/m4/riddle/rooms/section4/room402.cpp
+++ b/engines/m4/riddle/rooms/section4/room402.cpp
@@ -398,7 +398,10 @@ void Room402::daemon() {
 			_val11 = 1105;
 			break;
 		case 1001:
-			_trigger1 = (_G(flags)[V132]) ? 300 : 1112;
+			if (_G(flags)[V132])
+				_trigger1 = 300;
+			else
+				_val11 = 1112;
 			break;
 
 		default:
@@ -1765,11 +1768,24 @@ void Room402::conv402a() {
 				kernel_timing_trigger(1, 110);
 				_G(kernel).trigger_mode = KT_PARSE;
 			} else {
-				_val11 = (_val11 == 1001) ? 1114 : 2142;
+				_val11 = (_val10 == 1001) ? 1114 : 2142;
 				digi_play(sound, 1, 255, 777);
 			}
 			break;
+		case 26:
+			if (entry == 2) {
+				_val10 = 1001;
+				_val11 = 1115;
+				_sound2 = sound;
+				_wolfMode = 2002;
+				_wolfShould = 2180;
 
+				_G(kernel).trigger_mode = KT_DAEMON;
+				kernel_timing_trigger(1, 110);
+				_G(kernel).trigger_mode = KT_PARSE;
+			}
+			break;
+			
 		default:
 			_val11 = (_val10 == 1001) ? 1114 : 2142;
 			digi_play(sound, 1, 255, 777);