[Scummvm-git-logs] scummvm master -> 95634f8ab1a743f1d104499fcac9a93284d02ea6

[dreammaster]

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:
95634f8ab1 M4: RIDDLE: Restore the trigger mode in Section9Room::escapePressed()


Commit: 95634f8ab1a743f1d104499fcac9a93284d02ea6
    https://github.com/scummvm/scummvm/commit/95634f8ab1a743f1d104499fcac9a93284d02ea6
Author: sloanext (46776957+sloanext at users.noreply.github.com)
Date: 2026-08-08T11:46:39+10:00

Commit Message:
M4: RIDDLE: Restore the trigger mode in Section9Room::escapePressed()

escapePressed() runs from the event handler, outside of the daemon/parser
dispatch, so leaving KT_DAEMON behind means the next trigger the parser
issues is delivered to the daemon instead.

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


diff --git a/engines/m4/riddle/rooms/section9/section9_room.cpp b/engines/m4/riddle/rooms/section9/section9_room.cpp
index 877a9062924..a5e1ed767d3 100644
--- a/engines/m4/riddle/rooms/section9/section9_room.cpp
+++ b/engines/m4/riddle/rooms/section9/section9_room.cpp
@@ -27,8 +27,13 @@ namespace Riddle {
 namespace Rooms {
 
 void Section9Room::escapePressed(void *, void *) {
+	// This runs from the event handler, outside of the daemon/parser dispatch,
+	// so the trigger mode has to be put back or the next trigger the parser
+	// issues would be delivered to the daemon instead
+	const KernelTriggerType oldMode = _G(kernel).trigger_mode;
 	_G(kernel).trigger_mode = KT_DAEMON;
 	disable_player_commands_and_fade_init(56);
+	_G(kernel).trigger_mode = oldMode;
 }
 
 } // namespace Rooms