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

[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:
f9ee1a8e1a M4: RIDDLE: Fix sending parcels with Lima travel agent
d49ec5a718 M4: RIDDLE: Fix travelling to Danzig from Lima


Commit: f9ee1a8e1aeacaf644455d873c069ee722042f87
    https://github.com/scummvm/scummvm/commit/f9ee1a8e1aeacaf644455d873c069ee722042f87
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-01-30T19:15:57-08:00

Commit Message:
M4: RIDDLE: Fix sending parcels with Lima travel agent

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 1a497817ce0..670929343ed 100644
--- a/engines/m4/riddle/rooms/section5/room501.cpp
+++ b/engines/m4/riddle/rooms/section5/room501.cpp
@@ -731,7 +731,7 @@ void Room501::daemon() {
 
 	case 540:
 		_agentShould = 5;
-		_xyzzy7 = kernel_trigger_create(540);
+		_xyzzy7 = kernel_trigger_create(541);
 		break;
 
 	case 541:
@@ -757,7 +757,7 @@ void Room501::daemon() {
 				"CHISEL",  "INCENSE BURNER",  "INCENSE BURNER"
 			};
 
-			inv_move_object(ITEMS[item - 1], (item == 12) ? NOWHERE : 305);
+			inv_move_object(ITEMS[item], (item == 11) ? NOWHERE : 305);
 		}
 		conv_resume();
 		break;
@@ -1102,6 +1102,7 @@ void Room501::daemon() {
 
 	case 611:
 		_ripleyShould = 3;
+		conv_resume();
 		break;
 
 	case 612:


Commit: d49ec5a718b27315253612652f7d3bd0383ded59
    https://github.com/scummvm/scummvm/commit/d49ec5a718b27315253612652f7d3bd0383ded59
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-01-30T19:17:24-08:00

Commit Message:
M4: RIDDLE: Fix travelling to Danzig from Lima

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


diff --git a/engines/m4/riddle/rooms/section4/room401.cpp b/engines/m4/riddle/rooms/section4/room401.cpp
index 0c593c8dfe4..2f3b3332bbe 100644
--- a/engines/m4/riddle/rooms/section4/room401.cpp
+++ b/engines/m4/riddle/rooms/section4/room401.cpp
@@ -1001,8 +1001,8 @@ void Room401::conv401a() {
 			ITEM(11, 8, "WHALE BONE HORN");
 			ITEM(11, 9, "CHISEL");
 			ITEM(11, 10, "INCENSE BURNER");
-			ITEM(11, 11, "ROMANOV EMERALD");
 #undef ITEM
+			if (node == 11 && entry == 11) inv_move_object("ROMANOV EMERALD", NOWHERE);
 
 			if (node != 11)
 				_val3 = 1;
diff --git a/engines/m4/riddle/rooms/section4/room495.cpp b/engines/m4/riddle/rooms/section4/room495.cpp
index 4ea23381f2e..10df10b1b4b 100644
--- a/engines/m4/riddle/rooms/section4/room495.cpp
+++ b/engines/m4/riddle/rooms/section4/room495.cpp
@@ -125,7 +125,7 @@ void Room495::init() {
 			play("495 lima to ny", "495lm02s", 18, 10);
 			break;
 		case 2:
-			play("495 lima to danzig", "495m03s", 70, 4);
+			play("495 lima to danzig", "495lm03s", 70, 4);
 			break;
 		case 3:
 			play("495 lima to sikkim", "495lm04s", 100, 3);