[Scummvm-git-logs] scummvm master -> 18e21e8bdae13f3c16e4eccf711fe3be21b4c796

[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:
18e21e8bda M4: RIDDLE: Fix getting obsidian disk


Commit: 18e21e8bdae13f3c16e4eccf711fe3be21b4c796
    https://github.com/scummvm/scummvm/commit/18e21e8bdae13f3c16e4eccf711fe3be21b4c796
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-26T22:53:16-08:00

Commit Message:
M4: RIDDLE: Fix getting obsidian disk

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


diff --git a/engines/m4/riddle/rooms/section6/room605.cpp b/engines/m4/riddle/rooms/section6/room605.cpp
index e1a0eac3488..a3e9439627b 100644
--- a/engines/m4/riddle/rooms/section6/room605.cpp
+++ b/engines/m4/riddle/rooms/section6/room605.cpp
@@ -652,44 +652,32 @@ bool Room605::takePupilDisk() {
 				triggerMachineByHashCallback, "take pupil");
 			sendWSMessage_10000(1, _ripley, _ripHandOnIris, 1, 26, 2,
 				_ripHandOnIris, 26, 26, 1);
-			return true;
+			break;
 		}
-		break;
-
-	case 1:
-		_ttShould = 7;
-		return true;
+		return false;
 
 	case 2:
 		sendWSMessage_10000(1, _ripley, _ripHandOnIris, 27, 41, 6,
 			_ripHandOnIris, 41, 41, 1);
-		digi_play("605r15", 1, 255, 4);
-		return true;
+		digi_play("605r15", 1, 255, 3);
+		break;
 
-	case 4:
-		_ttShould = 6;
-		digi_play("605t06", 1, 255, 8);
-		return true;
+	case 3:
+		digi_play(_G(flags)[V197] ? "605r33" : "605r32", 1);
+		break;
 
 	case 6:
 		terminateMachineAndNull(_ripley);
-		ws_unhide_walker();
-		return true;
-
-	case 8:
 		series_unload(_ripHandOnIris);
-		_ttShould = 0;
-		_G(kernel).trigger_mode = KT_DAEMON;
-		kernel_timing_trigger(1, 200);
+		ws_unhide_walker();
 		player_set_commands_allowed(true);
-		_G(flags)[V197] = 1;
-		return true;
+		break;
 
 	default:
-		break;
+		return false;
 	}
 
-	return false;
+	return true;
 }
 
 bool Room605::sleeveDisk1() {