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

[Strangerke]

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:
d9dd4852c3 M4: RIDDLE: Fix for bug #16081 in several rooms of group 7 (control not desactivated after click on look at grate)


Commit: d9dd4852c3b9cc37429ad6f6b8c3ff5261cd3fb9
    https://github.com/scummvm/scummvm/commit/d9dd4852c3b9cc37429ad6f6b8c3ff5261cd3fb9
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-07-06T20:36:27+01:00

Commit Message:
M4: RIDDLE: Fix for bug #16081 in several rooms of group 7 (control not desactivated after click on look at grate)

Changed paths:
    engines/m4/riddle/rooms/section7/room703.cpp
    engines/m4/riddle/rooms/section7/room704.cpp
    engines/m4/riddle/rooms/section7/room705.cpp
    engines/m4/riddle/rooms/section7/room706.cpp
    engines/m4/riddle/rooms/section7/room707.cpp


diff --git a/engines/m4/riddle/rooms/section7/room703.cpp b/engines/m4/riddle/rooms/section7/room703.cpp
index 6c81511f5ac..0b7b29f2689 100644
--- a/engines/m4/riddle/rooms/section7/room703.cpp
+++ b/engines/m4/riddle/rooms/section7/room703.cpp
@@ -353,6 +353,8 @@ void Room703::parser() {
 	} // talkFl && player_said("MONK #4")
 
 	else if (lookFl && player_said("GRATE")) {
+		player_set_commands_allowed(false);
+		
 		switch (_G(kernel).trigger) {
 		case -1: {
 			int32 keyValue = 0;
diff --git a/engines/m4/riddle/rooms/section7/room704.cpp b/engines/m4/riddle/rooms/section7/room704.cpp
index ea2e36827b2..5b1bba2b144 100644
--- a/engines/m4/riddle/rooms/section7/room704.cpp
+++ b/engines/m4/riddle/rooms/section7/room704.cpp
@@ -339,6 +339,8 @@ void Room704::parser() {
 	} // talkFl && player_said("MONK #8")
 
 	else if (lookFl && player_said("GRATE")) {
+		player_set_commands_allowed(false);
+
 		switch (_G(kernel).trigger) {
 		case -1:
 			player_update_info(_G(my_walker), &_G(player_info));
diff --git a/engines/m4/riddle/rooms/section7/room705.cpp b/engines/m4/riddle/rooms/section7/room705.cpp
index 7eac288ddf7..c5587789dc8 100644
--- a/engines/m4/riddle/rooms/section7/room705.cpp
+++ b/engines/m4/riddle/rooms/section7/room705.cpp
@@ -395,6 +395,8 @@ void Room705::parser() {
 	} // talkFl && player_said("MONK #12")
 
 	else if (lookFl && player_said("GRATE")) {
+		player_set_commands_allowed(false);
+		
 		switch (_G(kernel).trigger) {
 		case -1:
 			player_update_info(_G(my_walker), &_G(player_info));
diff --git a/engines/m4/riddle/rooms/section7/room706.cpp b/engines/m4/riddle/rooms/section7/room706.cpp
index 2ae91f58e27..6087ddb9da1 100644
--- a/engines/m4/riddle/rooms/section7/room706.cpp
+++ b/engines/m4/riddle/rooms/section7/room706.cpp
@@ -326,6 +326,8 @@ void Room706::parser() {
 	} // talkFl && player_said("MONK #15")
 
 	else if (lookFl && player_said("GRATE")) {
+		player_set_commands_allowed(false);
+
 		switch (_G(kernel).trigger) {
 		case -1:
 			player_update_info(_G(my_walker), &_G(player_info));
diff --git a/engines/m4/riddle/rooms/section7/room707.cpp b/engines/m4/riddle/rooms/section7/room707.cpp
index 01ace63bca8..a4a354fde68 100644
--- a/engines/m4/riddle/rooms/section7/room707.cpp
+++ b/engines/m4/riddle/rooms/section7/room707.cpp
@@ -183,6 +183,8 @@ void Room707::parser() {
 	} // lookFl && player_said("WINDOW ")
 
 	else if (lookFl && player_said("GRATE")) {
+		player_set_commands_allowed(false);
+
 		switch (_G(kernel).trigger) {
 		case -1:
 			player_update_info(_G(my_walker), &_G(player_info));