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

dreammaster noreply at scummvm.org
Fri Feb 7 02:09:36 UTC 2025


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

Summary:
31dc335885 M4: RIDDLE: Add extra call to debugRoomChanged when maze savegame loaded
c4029fbbe6 M4: RIDDLE: Properly mark messages as read in Sikkim travel agent
e76f980483 M4: RIDDLE: Fix mailing items from Sikkim


Commit: 31dc3358855b2152de69818b19f48db5dfbedb79
    https://github.com/scummvm/scummvm/commit/31dc3358855b2152de69818b19f48db5dfbedb79
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-06T16:59:58-08:00

Commit Message:
M4: RIDDLE: Add extra call to debugRoomChanged when maze savegame loaded

Changed paths:
    engines/m4/riddle/rooms/section7/room709.cpp


diff --git a/engines/m4/riddle/rooms/section7/room709.cpp b/engines/m4/riddle/rooms/section7/room709.cpp
index ab5cced816f..93525461a62 100644
--- a/engines/m4/riddle/rooms/section7/room709.cpp
+++ b/engines/m4/riddle/rooms/section7/room709.cpp
@@ -248,6 +248,7 @@ void Room709::init() {
 		break;
 	}
 
+	debugRoomChanged();
 	digi_play_loop("950_s41", 3, 255, -1, -1);
 }
 


Commit: c4029fbbe6c0c6e641ea3e3778b0194f33818f3a
    https://github.com/scummvm/scummvm/commit/c4029fbbe6c0c6e641ea3e3778b0194f33818f3a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-06T17:31:59-08:00

Commit Message:
M4: RIDDLE: Properly mark messages as read in Sikkim travel agent

Changed paths:
    engines/m4/riddle/rooms/section7/room701.cpp


diff --git a/engines/m4/riddle/rooms/section7/room701.cpp b/engines/m4/riddle/rooms/section7/room701.cpp
index 24ae9830a19..582b37819a3 100644
--- a/engines/m4/riddle/rooms/section7/room701.cpp
+++ b/engines/m4/riddle/rooms/section7/room701.cpp
@@ -1241,19 +1241,26 @@ void Room701::daemon() {
 			_itemDigiName = nullptr;
 		} else if (_G(flags)[V364] == 1) {
 			_field58_digiName = "201R26";
+			_G(flags)[V364] = 0;
 		} else if (_G(flags)[V365] == 1) {
 			_field58_digiName = "201R61";
+			_G(flags)[V365] = 0;
 		} else if (_G(flags)[V366] == 1) {
 			_field58_digiName = "401R31";
+			_G(flags)[V366] = 0;
 		} else if (_G(flags)[V373] == 1) {
 			_field58_digiName = "401R36";
+			_G(flags)[V373] = 0;
 		} else if (_G(flags)[V370] == 1) {
 			_field58_digiName = "501R02";
+			_G(flags)[V370] = 0;
 		} else if (_G(flags)[V371] == 1) {
 			_field58_digiName = "501R03";
+			_G(flags)[V371] = 0;
 		} else if (_G(flags)[V372] == 1) {
 			_field58_digiName = "701R39";
 			_field5C_digiName = "701R39A";
+			_G(flags)[V372] = 0;
 		} else if (_G(flags)[V367] == 1) {
 			_field58_digiName = "401R37";
 			_G(flags)[V367] = 0;


Commit: e76f9804837e5b5ef8e3d02c2026eabe20361884
    https://github.com/scummvm/scummvm/commit/e76f9804837e5b5ef8e3d02c2026eabe20361884
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-02-06T18:09:24-08:00

Commit Message:
M4: RIDDLE: Fix mailing items from Sikkim

Changed paths:
    engines/m4/riddle/rooms/section7/room701.cpp


diff --git a/engines/m4/riddle/rooms/section7/room701.cpp b/engines/m4/riddle/rooms/section7/room701.cpp
index 582b37819a3..cab7634de2d 100644
--- a/engines/m4/riddle/rooms/section7/room701.cpp
+++ b/engines/m4/riddle/rooms/section7/room701.cpp
@@ -1105,7 +1105,7 @@ void Room701::daemon() {
 			case 3706:
 				terminateMachine(_agentPoshExpressMach02);
 				_ripleyMode = 1000;
-				_ripleyShould = 98;
+				_ripleyShould = 1103;
 				player_update_info(_G(my_walker), &_G(player_info));
 				_ripTalksAgentMach = TriggerMachineByHash(1, 1, 0, 0, 0, 0, _G(player_info).x, _G(player_info).y, _G(player_info).scale, 256, false, triggerMachineByHashCallback, "rip talks agent");
 				sendWSMessage_10000(1, _ripTalksAgentMach, _ripTrekTalkerPos3Series, 5, 5, 102, _ripTrekTalkerPos3Series, 5, 5, 0);




More information about the Scummvm-git-logs mailing list