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

Strangerke noreply at scummvm.org
Fri Jul 4 04:15:37 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:
b565d5c647 M4: RIDDLE: Fix for bug #16077 in room 996: Add workaround for (potentially original) bug in the journal. When the dialo


Commit: b565d5c647c24b1fdc42ec78ed4860a4cbe1cb3b
    https://github.com/scummvm/scummvm/commit/b565d5c647c24b1fdc42ec78ed4860a4cbe1cb3b
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-07-04T05:15:18+01:00

Commit Message:
M4: RIDDLE: Fix for bug #16077 in room 996: Add workaround for (potentially original) bug in the journal. When the dialog in the hall of history doesn't trigger the flag set, the logic of display is incoherent. Now it's coherent, though it's weird the flag isn't set...

Changed paths:
    engines/m4/riddle/rooms/section9/room996.cpp


diff --git a/engines/m4/riddle/rooms/section9/room996.cpp b/engines/m4/riddle/rooms/section9/room996.cpp
index 6ea71f0a377..bb46d51a337 100644
--- a/engines/m4/riddle/rooms/section9/room996.cpp
+++ b/engines/m4/riddle/rooms/section9/room996.cpp
@@ -237,7 +237,9 @@ void Room996::parser() {
 			kernel_timing_trigger(10, 1, nullptr);
 
 		} else if (_G(kernel).trigger == 1) {
-			if (_G(flags)[V285])
+			// Original is only checking against flag 285. The problem is that if it's missing, it's becoming incoherent after,
+			// so I added the other flags in the check to display the title when other things are displayed.
+			if (_G(flags)[V285] || _G(flags)[V286] || _G(flags)[V287] || _G(flags)[V288] || _G(flags)[V289])
 				_roomStates_ripTalker = series_show("996 TITLE JOURNAL TYPE", 256, 16, -1, -1, 0, 100, 0, 0);
 
 			if (_G(flags)[V286])




More information about the Scummvm-git-logs mailing list