[Scummvm-git-logs] scummvm master -> 479b84c7892a7a5c6cb54069ba3960d7c06aa046

[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:
479b84c789 M4: RIDDLE: Room 604: Fix check cascade in useWhaleBoneHorn, fix bug in killRipley


Commit: 479b84c7892a7a5c6cb54069ba3960d7c06aa046
    https://github.com/scummvm/scummvm/commit/479b84c7892a7a5c6cb54069ba3960d7c06aa046
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-16T10:17:18+01:00

Commit Message:
M4: RIDDLE: Room 604: Fix check cascade in useWhaleBoneHorn, fix bug in killRipley

Changed paths:
    engines/m4/riddle/flags.h
    engines/m4/riddle/rooms/section6/room604.cpp


diff --git a/engines/m4/riddle/flags.h b/engines/m4/riddle/flags.h
index d7dd7517942..dea6cedf93c 100644
--- a/engines/m4/riddle/flags.h
+++ b/engines/m4/riddle/flags.h
@@ -222,7 +222,7 @@ enum Flag {
 	V186 = 186,
 	V187 = 187,
 	V188 = 188,
-	V189 = 189,
+	V189 = 189, // Room 604: 2= wire connected to pull 3= Also connected to the plug
 	V190 = 190,
 	V191 = 191,
 	V192 = 192,
diff --git a/engines/m4/riddle/rooms/section6/room604.cpp b/engines/m4/riddle/rooms/section6/room604.cpp
index 7061187b8e3..1b0360f0d00 100644
--- a/engines/m4/riddle/rooms/section6/room604.cpp
+++ b/engines/m4/riddle/rooms/section6/room604.cpp
@@ -798,11 +798,11 @@ bool Room604::useWhaleBoneHorn() {
 	switch (_G(kernel).trigger) {
 	case 5:
 		_ripley = series_play("BAD GUYS LOOK TO SHED", 0, 0, 6, 6);
-		return true;
+		return false;
 
 	case 6:
 		kernel_timing_trigger(30, 7);
-		return true;
+		return false;
 
 	case 7:
 		digi_play("604k01", 1);
@@ -829,7 +829,7 @@ void Room604::killRipley() {
 
 	case 1:
 		if (_G(flags)[V189] == 3) {
-			series_play("glass flowing out", 0x700, 0, 2, 5);
+			series_play("gas flowing out", 0x700, 0, 2, 5);
 
 			if (inv_object_is_here("LIGHTER")) {
 				kernel_timing_trigger(20, 30);