[Scummvm-git-logs] scummvm master -> 264b9e833d3f296977a8b16a819e272a136e47d3

[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:
264b9e833d M4: RIDDLE: Disable hotspots when Danzig writing desk open


Commit: 264b9e833d3f296977a8b16a819e272a136e47d3
    https://github.com/scummvm/scummvm/commit/264b9e833d3f296977a8b16a819e272a136e47d3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-01-31T18:25:24-08:00

Commit Message:
M4: RIDDLE: Disable hotspots when Danzig writing desk open

Changed paths:
    engines/m4/riddle/rooms/section4/room406.cpp


diff --git a/engines/m4/riddle/rooms/section4/room406.cpp b/engines/m4/riddle/rooms/section4/room406.cpp
index 6f64a096503..1e3c1c5a130 100644
--- a/engines/m4/riddle/rooms/section4/room406.cpp
+++ b/engines/m4/riddle/rooms/section4/room406.cpp
@@ -334,17 +334,14 @@ void Room406::pre_parser() {
 	} else if (deskDrawerState == 1000) {
 		_G(player).resetWalk();
 
-		if (!player_said(" ") &&
-			!(lookFlag && player_said("MESSAGE LOG")) &&
-			!player_said("journal")) {
-			if (!useFlag || !player_said("DESK DRAWER OPEN"))
-				return;
+		if (player_said(" ") ||
+				(lookFlag && player_said("MESSAGE LOG")) ||
+				player_said("journal") ||
+				(useFlag && player_said("DESK DRAWER OPEN"))) {
+			intr_cancel_sentence();
+			deskDrawerState = 1001;
+			kernel_timing_trigger(1, 20, KT_DAEMON, KT_PARSE);
 		}
-
-		intr_cancel_sentence();
-		deskDrawerState = 1001;
-		kernel_timing_trigger(1, 20, KT_DAEMON, KT_PARSE);
-
 	} else if (player_said("journal") && !takeFlag && !lookFlag &&
 			_G(kernel).trigger == -1) {
 		_G(player).resetWalk();
@@ -622,6 +619,7 @@ void Room406::parser() {
 			deskDrawerState = 1000;
 			_emptyDrawer = series_place_sprite("406 DESK DRAWER EMPTY", 0, 0, 0, 100, 0x200);
 			digi_play("406_s02", 2);
+			disableHotspots();
 			hotspot_set_active(" ", true);
 			hotspot_set_active("DESK DRAWER OPEN", true);
 			hotspot_set_active("MESSAGES", true);