[Scummvm-git-logs] scummvm master -> 924428aa61a819c45956ab140aba214de7fb29e9

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
74f71e61a9 M4: RIDDLE: Fix sound name in room 305 x-area response
924428aa61 M4: RIDDLE: Fix room 305 follow-up lines for found cartoons


Commit: 74f71e61a9aba78b6e52dc9b74b80af399425bd6
    https://github.com/scummvm/scummvm/commit/74f71e61a9aba78b6e52dc9b74b80af399425bd6
Author: sloanext (46776957+sloanext at users.noreply.github.com)
Date: 2026-10-19T19:56:18-10:00

Commit Message:
M4: RIDDLE: Fix sound name in room 305 x-area response

Changed paths:
    engines/m4/riddle/rooms/section3/room305.cpp


diff --git a/engines/m4/riddle/rooms/section3/room305.cpp b/engines/m4/riddle/rooms/section3/room305.cpp
index 37101f9121c..1366426d0a3 100644
--- a/engines/m4/riddle/rooms/section3/room305.cpp
+++ b/engines/m4/riddle/rooms/section3/room305.cpp
@@ -1009,7 +1009,7 @@ next4:
 			break;
 
 		case 4:
-			digi_play("305r29a", 1);
+			digi_play("305r29b", 1);
 			break;
 
 		default:


Commit: 924428aa61a819c45956ab140aba214de7fb29e9
    https://github.com/scummvm/scummvm/commit/924428aa61a819c45956ab140aba214de7fb29e9
Author: sloanext (46776957+sloanext at users.noreply.github.com)
Date: 2026-10-19T19:56:18-10:00

Commit Message:
M4: RIDDLE: Fix room 305 follow-up lines for found cartoons

Changed paths:
    engines/m4/riddle/rooms/section3/room305.cpp


diff --git a/engines/m4/riddle/rooms/section3/room305.cpp b/engines/m4/riddle/rooms/section3/room305.cpp
index 1366426d0a3..92bfbd8a8dd 100644
--- a/engines/m4/riddle/rooms/section3/room305.cpp
+++ b/engines/m4/riddle/rooms/section3/room305.cpp
@@ -960,7 +960,7 @@ next4:
 			};
 			const bool flag = flags[area - 1] != 0;
 			if (flag && (area == 3 || area == 9))
-				player_set_commands_allowed(true);
+				player_set_commands_allowed(false);
 
 			interface_hide();
 			hotspot_hide_all();
@@ -983,9 +983,9 @@ next4:
 				digiName = getXAreaDigi2();
 			}
 
-			if (getXAreaNum() == 3 && caseFlag) {
+			if (getXAreaNum() == 3 && flag) {
 				digi_play("305r23", 1, 255, 2);
-			} else if (getXAreaNum() == 9 && caseFlag) {
+			} else if (getXAreaNum() == 9 && flag) {
 				digi_play("305r29", 1, 255, 3);
 			} else {
 				digi_play(digiName.c_str(), 1);
@@ -1005,11 +1005,13 @@ next4:
 				digi_play("305r29a", 1, 255, 4);
 			} else {
 				digi_play("305r29a", 1);
+				player_set_commands_allowed(true);
 			}
 			break;
 
 		case 4:
 			digi_play("305r29b", 1);
+			player_set_commands_allowed(true);
 			break;
 
 		default: