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

[dreammaster]

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

Summary:
7e425035eb M4: RIDDLE: Fix getting Menendez items
d5603f4c95 M4: RIDDLE: Fix journal handling in global_parser


Commit: 7e425035eb5736f7ef5453b24e3f90ce71581a9b
    https://github.com/scummvm/scummvm/commit/7e425035eb5736f7ef5453b24e3f90ce71581a9b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-03T19:45:10-08:00

Commit Message:
M4: RIDDLE: Fix getting Menendez items

Changed paths:
    engines/m4/riddle/rooms/section5/room504.cpp


diff --git a/engines/m4/riddle/rooms/section5/room504.cpp b/engines/m4/riddle/rooms/section5/room504.cpp
index b74a65878cf..2f2691e6ddf 100644
--- a/engines/m4/riddle/rooms/section5/room504.cpp
+++ b/engines/m4/riddle/rooms/section5/room504.cpp
@@ -3006,7 +3006,7 @@ void Room504::parser() {
 				break;
 			case 4:
 				series_unload(_ripLowReach);
-				inv_give_to_player("WHELED TOY");
+				inv_give_to_player("WHEELED TOY");
 				setMiscItems();
 				player_set_commands_allowed(true);
 				break;
@@ -3080,6 +3080,7 @@ void Room504::parser() {
 			sendWSMessage_140000(4);
 			break;
 		case 4:
+			_G(flags)[V155] = 1;
 			inv_give_to_player("WOODEN LADDER");
 			setMiscItems();
 			series_unload(_ripLowReach);


Commit: d5603f4c95bee2e8f3c7e0080223d07526bc5d11
    https://github.com/scummvm/scummvm/commit/d5603f4c95bee2e8f3c7e0080223d07526bc5d11
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-03T19:45:34-08:00

Commit Message:
M4: RIDDLE: Fix journal handling in global_parser

Changed paths:
    engines/m4/riddle/riddle.cpp


diff --git a/engines/m4/riddle/riddle.cpp b/engines/m4/riddle/riddle.cpp
index 01c195be2e9..5f99eb23f2d 100644
--- a/engines/m4/riddle/riddle.cpp
+++ b/engines/m4/riddle/riddle.cpp
@@ -160,13 +160,13 @@ void RiddleEngine::global_parser() {
 	} else if (useFlag && player_said("UNLIT URN")) {
 		digi_play("COM073", 1, 255, -1, 997);
 
-	} else if (!player_said("journal", " ") &&
-			!player_said("journal", "tower") &&
-			!player_said("journal", "tower ") &&
-			!player_said("journal", "dome") &&
-			!player_said("journal", "observatory dome") &&
-			!player_said("journal", "terrace") &&
-			!takeFlag && !lookFlag && inv_player_has(_G(player).noun) &&
+	} else if ((player_said("journal", " ") ||
+			player_said("journal", "tower") ||
+			player_said("journal", "tower ") ||
+			player_said("journal", "dome") ||
+			player_said("journal", "observatory dome") ||
+			player_said("journal", "terrace")) &&
+			!takeFlag && !lookFlag && !inv_player_has(_G(player).noun) &&
 			_G(game).room_id >= 504 && _G(game).room_id <= 510 &&
 			_G(game).room_id != 507) {
 		if (_G(flags)[kMocaMocheCartoon]) {
@@ -176,7 +176,7 @@ void RiddleEngine::global_parser() {
 				_G(flags)[V089] = 1;
 				_G(flags)[kMocaMocheCartoon] = 1;
 			}
-			
+
 			sketchInJournal("COM028");
 		}
 	} else if ((player_said("journal", " ") || player_said("journal", "temple")) &&