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

[Strangerke]

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:
169611094a M4: RIDDLE: Room 401: Fix missing set flag when sending Romanov Emerald by mail
fd0a1b5893 M4: RIDDLE: Room 501: Fix sending Romanov Emerald by mail (and add setFlag45)


Commit: 169611094afc85f8508220a6804895ce0716cf80
    https://github.com/scummvm/scummvm/commit/169611094afc85f8508220a6804895ce0716cf80
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-16T19:20:11+01:00

Commit Message:
M4: RIDDLE: Room 401: Fix missing set flag when sending Romanov Emerald by mail

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


diff --git a/engines/m4/riddle/rooms/section4/room401.cpp b/engines/m4/riddle/rooms/section4/room401.cpp
index 442ad6269ba..3a27fb196d1 100644
--- a/engines/m4/riddle/rooms/section4/room401.cpp
+++ b/engines/m4/riddle/rooms/section4/room401.cpp
@@ -1002,8 +1002,10 @@ void Room401::conv401a() {
 			ITEM(11, 9, "CHISEL");
 			ITEM(11, 10, "INCENSE BURNER");
 #undef ITEM
-			if (node == 11 && entry == 11)
+			if (node == 11 && entry == 11) {
+				setFlag45();
 				inv_move_object("ROMANOV EMERALD", NOWHERE);
+			}
 
 			if (node != 11)
 				_ripleyShould = 1;


Commit: fd0a1b589361987ba84d68545512c65a3b48b3cd
    https://github.com/scummvm/scummvm/commit/fd0a1b589361987ba84d68545512c65a3b48b3cd
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-16T19:20:45+01:00

Commit Message:
M4: RIDDLE: Room 501: Fix sending Romanov Emerald by mail (and add setFlag45)

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


diff --git a/engines/m4/riddle/rooms/section5/room501.cpp b/engines/m4/riddle/rooms/section5/room501.cpp
index 3ca379a02a3..e899750ea24 100644
--- a/engines/m4/riddle/rooms/section5/room501.cpp
+++ b/engines/m4/riddle/rooms/section5/room501.cpp
@@ -755,10 +755,15 @@ void Room501::daemon() {
 				"WHEELED TOY", "REBUS AMULET", "SHRUNKEN HEAD",
 				"SILVER BUTTERFLY", "POSTAGE STAMP",
 				"GERMAN BANKNOTE", "WHALE BONE HORN",
-				"CHISEL",  "INCENSE BURNER",  "INCENSE BURNER"
+				"CHISEL",  "INCENSE BURNER",  "ROMANOV EMERALD"
 			};
 
-			inv_move_object(ITEMS[item], (item == 11) ? NOWHERE : 305);
+			if (item != 11)
+				inv_move_object(ITEMS[item], 305);
+			else {
+				setFlag45();
+				inv_move_object(ITEMS[item], NOWHERE);
+			}
 		}
 		conv_resume();
 		break;