[Scummvm-git-logs] scummvm master -> 46df010486f4d938841981bbb9551f3495c0fc01

[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:
db254355b0 M4: RIDDLE: Fix bug in room 305 (open drawer)
46df010486 M4: RIDDLE: Fix bug in room 409


Commit: db254355b0e9e8e47861d6b046363e7688c8b0f5
    https://github.com/scummvm/scummvm/commit/db254355b0e9e8e47861d6b046363e7688c8b0f5
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-08T09:44:49+01:00

Commit Message:
M4: RIDDLE: Fix bug in room 305 (open drawer)

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 780404822fd..1fb26ab3983 100644
--- a/engines/m4/riddle/rooms/section3/room305.cpp
+++ b/engines/m4/riddle/rooms/section3/room305.cpp
@@ -1440,7 +1440,7 @@ void Room305::openDrawer() {
 
 		if (_G(flags)[V000]) {
 			_rip4 = series_load("RIP TREK MED REACH HAND POS1");
-			setGlobals1(1, 5, 5, 5, 0, 5, 1, 1, 1);
+			setGlobals1(_rip4, 1, 5, 5, 5, 0, 5, 1, 1, 1);
 			sendWSMessage_110000(1);
 		} else {
 			ws_hide_walker();


Commit: 46df010486f4d938841981bbb9551f3495c0fc01
    https://github.com/scummvm/scummvm/commit/46df010486f4d938841981bbb9551f3495c0fc01
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-03-08T09:45:23+01:00

Commit Message:
M4: RIDDLE: Fix bug in room 409

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


diff --git a/engines/m4/riddle/rooms/section4/room409.cpp b/engines/m4/riddle/rooms/section4/room409.cpp
index 7d9449f4295..51825f83e81 100644
--- a/engines/m4/riddle/rooms/section4/room409.cpp
+++ b/engines/m4/riddle/rooms/section4/room409.cpp
@@ -242,7 +242,7 @@ void Room409::daemon() {
 		break;
 
 	case 403:
-		setGlobals1(1, _seriesReachHand, 10, 10, 10, 0, 10, 1, 1, 1);
+		setGlobals1(_seriesReachHand, 1, 10, 10, 10, 0, 10, 1, 1, 1);
 		sendWSMessage_110000(405);
 		break;