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

[dreammaster]

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:
91ea0300b5 M4: RIDDLE: Fix taking lighter
a289184b49 M4: RIDDLE: Minor cleanup of autosave
e846eeb5e2 M4: RIDDLE: Fixes for getting water, tablet


Commit: 91ea0300b5935e07244377a393360867b7495634
    https://github.com/scummvm/scummvm/commit/91ea0300b5935e07244377a393360867b7495634
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-01-29T17:58:36-08:00

Commit Message:
M4: RIDDLE: Fix taking lighter

Changed paths:
    engines/m4/riddle/rooms/section6/room608.cpp


diff --git a/engines/m4/riddle/rooms/section6/room608.cpp b/engines/m4/riddle/rooms/section6/room608.cpp
index c3bdda81860..9f3006ddd15 100644
--- a/engines/m4/riddle/rooms/section6/room608.cpp
+++ b/engines/m4/riddle/rooms/section6/room608.cpp
@@ -1975,6 +1975,8 @@ bool Room608::takeLighter() {
 		if (inv_object_is_here("LIGHTER")) {
 			player_set_commands_allowed(false);
 			_ripLowReach = series_load("RIP LOW REACH POS1");
+			setGlobals1(_ripLowReach, 1, 16, 16, 16);
+			sendWSMessage_110000(2);
 			return true;
 		}
 		break;


Commit: a289184b494c8fa9f40ad1d26fe25ca0c0af68d6
    https://github.com/scummvm/scummvm/commit/a289184b494c8fa9f40ad1d26fe25ca0c0af68d6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-01-29T18:49:24-08:00

Commit Message:
M4: RIDDLE: Minor cleanup of autosave

Changed paths:
    engines/m4/m4.cpp
    engines/m4/riddle/rooms/room.cpp


diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index 4fbb53350df..5d9e0c9a050 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -120,7 +120,9 @@ void M4Engine::m4_inflight() {
 	while (KEEP_PLAYING) {
 		if (_G(game).previous_room == KERNEL_RESTORING_GAME) {
 			midi_stop();
-			kernel_load_game(_G(kernel).restore_slot);
+			int slot = _G(kernel).restore_slot;
+			if (!kernel_load_game(slot))
+				error("Could not restore save slot %d", slot);
 		}
 
 		// Start up next section
diff --git a/engines/m4/riddle/rooms/room.cpp b/engines/m4/riddle/rooms/room.cpp
index d7c1d588aca..288ca8442e4 100644
--- a/engines/m4/riddle/rooms/room.cpp
+++ b/engines/m4/riddle/rooms/room.cpp
@@ -36,8 +36,7 @@ void Room::preload() {
 }
 
 void Room::restoreAutosave() {
-	if (g_engine->loadGameState(0).getCode() != Common::kNoError)
-		error("Could not restore autosave");
+	g_engine->loadGameState(0);
 }
 
 int Room::checkFlags(bool flag) {


Commit: e846eeb5e2fd274374c9502122783346ba7176ff
    https://github.com/scummvm/scummvm/commit/e846eeb5e2fd274374c9502122783346ba7176ff
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-01-29T20:03:35-08:00

Commit Message:
M4: RIDDLE: Fixes for getting water, tablet

Changed paths:
    engines/m4/riddle/rooms/section6/room607.cpp
    engines/m4/riddle/rooms/section6/room608.cpp


diff --git a/engines/m4/riddle/rooms/section6/room607.cpp b/engines/m4/riddle/rooms/section6/room607.cpp
index d5868250eb8..bc833288513 100644
--- a/engines/m4/riddle/rooms/section6/room607.cpp
+++ b/engines/m4/riddle/rooms/section6/room607.cpp
@@ -188,6 +188,7 @@ void Room607::parser() {
 			terminateMachineAndNull(_tablet);
 			kernel_examine_inventory_object("ping rongorongo tablet", 5, 1, 212, 150, 5,
 				_val1 ? "607r09" : nullptr);
+			_G(flags)[V203] = 8;
 			break;
 		case 5:
 			terminateMachineAndNull(_ripReach);
diff --git a/engines/m4/riddle/rooms/section6/room608.cpp b/engines/m4/riddle/rooms/section6/room608.cpp
index 9f3006ddd15..2ab41d7f9d9 100644
--- a/engines/m4/riddle/rooms/section6/room608.cpp
+++ b/engines/m4/riddle/rooms/section6/room608.cpp
@@ -2022,6 +2022,7 @@ bool Room608::hornCordWater() {
 
 			_shadow5 = series_show("safari shadow 5", _G(player_info).depth, 144, -1, -1, 0,
 				_G(player_info).scale, _G(player_info).x, _G(player_info.y));
+			_horn = series_load("608horn");
 			_ol2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x100, 0,
 				triggerMachineByHashCallback, "ol");
 			sendWSMessage_10000(1, _ol2, _horn, 1, 16, 2, _horn, 16, 16, 0);