[Scummvm-git-logs] scummvm master -> 9b6ce0b0c2d7f2cdd1d3fe4835d6f7a7fb847a84

Strangerke noreply at scummvm.org
Wed Jul 9 04:55:06 UTC 2025


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:
9b6ce0b0c2 M4: RIDDLE: Fix for bug #16090 in room 604 (soft lock when dying in the sched)


Commit: 9b6ce0b0c2d7f2cdd1d3fe4835d6f7a7fb847a84
    https://github.com/scummvm/scummvm/commit/9b6ce0b0c2d7f2cdd1d3fe4835d6f7a7fb847a84
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-07-09T05:54:36+01:00

Commit Message:
M4: RIDDLE: Fix for bug #16090 in room 604 (soft lock when dying in the sched)

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


diff --git a/engines/m4/riddle/rooms/section6/room604.cpp b/engines/m4/riddle/rooms/section6/room604.cpp
index cf95ed74fd4..cd10212c7ea 100644
--- a/engines/m4/riddle/rooms/section6/room604.cpp
+++ b/engines/m4/riddle/rooms/section6/room604.cpp
@@ -954,9 +954,6 @@ void Room604::killRipley() {
 		digi_play("dooropn2", 3);
 
 		switch (_G(flags)[V189]) {
-		case 1:
-			_shedDoor = series_play("SHED DOOR OPENS", 0x300, 16, 1, 11);
-			break;
 		case 2:
 			terminateMachineAndNull(_doorWireGone);
 			terminateMachineAndNull(_cord);
@@ -968,6 +965,7 @@ void Room604::killRipley() {
 			_shedDoor = series_play("604 DOOR OPEN PLUG IN", 0x300, 0, 556, 5, 0, 100, 0, 0, 0, 1);
 			break;
 		default:
+			_shedDoor = series_play("SHED DOOR OPENS", 0x300, 16, 1, 11);
 			break;
 		}
 		break;




More information about the Scummvm-git-logs mailing list