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

dreammaster noreply at scummvm.org
Sun Nov 24 06:30:06 UTC 2024


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:
bc0cbcbef7 M4: RIDDLE: Workaround series finishing too quickly hanging end of Twelvetrees conv


Commit: bc0cbcbef7c575370ce770d74967ab333c97988f
    https://github.com/scummvm/scummvm/commit/bc0cbcbef7c575370ce770d74967ab333c97988f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-23T22:29:42-08:00

Commit Message:
M4: RIDDLE: Workaround series finishing too quickly hanging end of Twelvetrees conv

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


diff --git a/engines/m4/riddle/rooms/section6/room603.cpp b/engines/m4/riddle/rooms/section6/room603.cpp
index 31170bc53f5..3957739b74b 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -1276,6 +1276,11 @@ void Room603::parser() {
 			_val9 = 1000;
 			_ripleyShould = 11;
 			_ttShould = 17;
+
+			// FIXME: The _ripTalk series triggered by case 301, mode 0 should 5
+			// finishes too quickly, and triggers case 301 before should = 11 is set above.
+			// To fix this, manually trigger case 301
+			kernel_timing_trigger(1, 301, KT_DAEMON, KT_PARSE);
 		}
 	} else if (_G(kernel).trigger == 748) {
 		if (_ttShould == 21) {




More information about the Scummvm-git-logs mailing list