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

[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:
9e47be2c53 M4: RIDDLE: Fix getting faucet pipe
cf6eed4df9 M4: RIDDLE: Fixes for getting pump rod and grip


Commit: 9e47be2c53be0e335185c7fe50c82573abd89d81
    https://github.com/scummvm/scummvm/commit/9e47be2c53be0e335185c7fe50c82573abd89d81
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-01T18:11:58-08:00

Commit Message:
M4: RIDDLE: Fix getting faucet pipe

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


diff --git a/engines/m4/riddle/rooms/section4/room407.cpp b/engines/m4/riddle/rooms/section4/room407.cpp
index 7f7ca3984f6..c9190df84b1 100644
--- a/engines/m4/riddle/rooms/section4/room407.cpp
+++ b/engines/m4/riddle/rooms/section4/room407.cpp
@@ -4760,11 +4760,11 @@ void Room407::takeFaucetPipe3() {
 		break;
 
 	case 2:
-		sendWSMessage_120000(4);
+		sendWSMessage_120000(3);
 		break;
 
 	case 3:
-		sendWSMessage_150000(5);
+		sendWSMessage_150000(4);
 		break;
 
 	case 4:


Commit: cf6eed4df93c6c2d6350d0db0fb0fff131b65217
    https://github.com/scummvm/scummvm/commit/cf6eed4df93c6c2d6350d0db0fb0fff131b65217
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-01T19:08:49-08:00

Commit Message:
M4: RIDDLE: Fixes for getting pump rod and grip

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


diff --git a/engines/m4/riddle/rooms/section4/room407.cpp b/engines/m4/riddle/rooms/section4/room407.cpp
index c9190df84b1..0efcb8ee160 100644
--- a/engines/m4/riddle/rooms/section4/room407.cpp
+++ b/engines/m4/riddle/rooms/section4/room407.cpp
@@ -5703,23 +5703,30 @@ void Room407::takePumpRod1() {
 		}
 		break;
 
+	case 2:
+		kernel_timing_trigger(1, 3);
+		break;
+
 	case 3:
 		kernel_examine_inventory_object("PING PUMP ROD",
 			_G(master_palette), 5, 1, 125, 200, 4, nullptr, -1);
 		break;
 
+	case 4:
+		kernel_timing_trigger(1, 5);
+		break;
+
 	case 5:
 		terminateMachineAndNull(_pump);
 		hotspot_set_active("PUMP ROD", false);
 		inv_give_to_player("PUMP ROD");
-		sendWSMessage_10000(1, _ripley, _pump407, 14, 1, 6,
-			_pump407, 1, 1, 0);
+		sendWSMessage_10000(1, _ripley, _pump407, 14, 1, 6, _pump407, 1, 1, 0);
 		break;
 
 	case 6:
 		terminateMachineAndNull(_ripley);
 		terminateMachineAndNull(_safariShadow);
-		ws_hide_walker();
+		ws_unhide_walker();
 		series_unload(_pump407);
 		_rodState = 1000;
 		player_set_commands_allowed(true);
@@ -5874,6 +5881,7 @@ void Room407::takePumpGrips2() {
 		terminateMachineAndNull(_handleInDrawer);
 		inv_give_to_player("PUMP GRIPS");
 		hotspot_set_active("PUMP GRIPS ", false);
+		_pumpState = 1000;
 		kernel_examine_inventory_object("PING PUMP GRIPS",
 			_G(master_palette), 5, 1, 125, 200, 2, nullptr, -1);
 		break;
@@ -5886,6 +5894,7 @@ void Room407::takePumpGrips2() {
 	case 4:
 		terminateMachineAndNull(_ripley);
 		terminateMachineAndNull(_safariShadow);
+		ws_unhide_walker();
 		series_unload(_pump407);
 		player_set_commands_allowed(true);
 		break;