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

[Strangerke]

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

Summary:
526e521657 M4: RIDDLE: Fix for #16103 - auto save missing in room 304
ca81387283 M4: RIDDLE: Review all the calls to auto save, uniformize the use of SetRoom(413), fix a forgotten autosave in room 301


Commit: 526e52165768ee46af9375900210c5a0f76ffbce
    https://github.com/scummvm/scummvm/commit/526e52165768ee46af9375900210c5a0f76ffbce
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-07-12T07:12:10+01:00

Commit Message:
M4: RIDDLE: Fix for #16103 - auto save missing in room 304

Changed paths:
    engines/m4/riddle/rooms/section3/room304.cpp


diff --git a/engines/m4/riddle/rooms/section3/room304.cpp b/engines/m4/riddle/rooms/section3/room304.cpp
index 525edd5fb9f..466a0a8d9d7 100644
--- a/engines/m4/riddle/rooms/section3/room304.cpp
+++ b/engines/m4/riddle/rooms/section3/room304.cpp
@@ -23,6 +23,8 @@
 #include "m4/gui/gui_sys.h"
 #include "m4/platform/keys.h"
 #include "m4/riddle/rooms/section3/room304.h"
+
+#include "m4/adv_r/other.h"
 #include "m4/riddle/vars.h"
 #include "m4/riddle/riddle.h"
 
@@ -248,6 +250,7 @@ void Room304::parser() {
 			kernel_timing_trigger(120, 53);
 			break;
 		case 53:
+			other_save_game_for_resurrection();
 			_G(game).setRoom(413);
 			break;
 		case 54:


Commit: ca81387283d26c52e91f960b39d3de94398fea3c
    https://github.com/scummvm/scummvm/commit/ca81387283d26c52e91f960b39d3de94398fea3c
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-07-12T07:14:52+01:00

Commit Message:
M4: RIDDLE: Review all the calls to auto save, uniformize the use of SetRoom(413), fix a forgotten autosave in room 301

Changed paths:
    engines/m4/riddle/rooms/section2/room205.cpp
    engines/m4/riddle/rooms/section3/room301.cpp
    engines/m4/riddle/rooms/section8/room806.cpp
    engines/m4/riddle/rooms/section8/room807.cpp
    engines/m4/riddle/rooms/section8/room808.cpp


diff --git a/engines/m4/riddle/rooms/section2/room205.cpp b/engines/m4/riddle/rooms/section2/room205.cpp
index 5be7beee2b9..66bb907f636 100644
--- a/engines/m4/riddle/rooms/section2/room205.cpp
+++ b/engines/m4/riddle/rooms/section2/room205.cpp
@@ -512,8 +512,8 @@ void Room205::parser() {
 			_fieldDC = 0;
 			_fieldE0 = 0;
 			other_save_game_for_resurrection();
-			_G(game).new_section = 4;
-			_G(game).new_room = 413;
+			_G(game).setRoom(413);
+
 			break;
 
 		case 99:
diff --git a/engines/m4/riddle/rooms/section3/room301.cpp b/engines/m4/riddle/rooms/section3/room301.cpp
index e43928ec7d2..d8ba56d7a23 100644
--- a/engines/m4/riddle/rooms/section3/room301.cpp
+++ b/engines/m4/riddle/rooms/section3/room301.cpp
@@ -20,6 +20,8 @@
  */
 
 #include "m4/riddle/rooms/section3/room301.h"
+
+#include "m4/adv_r/other.h"
 #include "m4/graphics/gr_series.h"
 #include "m4/riddle/vars.h"
 
@@ -752,6 +754,7 @@ void Room301::daemon() {
 		break;
 
 	case 209:
+		other_save_game_for_resurrection();
 		_G(game).setRoom(413);
 		break;
 
diff --git a/engines/m4/riddle/rooms/section8/room806.cpp b/engines/m4/riddle/rooms/section8/room806.cpp
index be7b5a47ed3..8567fee71f3 100644
--- a/engines/m4/riddle/rooms/section8/room806.cpp
+++ b/engines/m4/riddle/rooms/section8/room806.cpp
@@ -1073,8 +1073,7 @@ void Room806::parser() {
 			ws_demand_location(_G(my_walker), 221, 316);
 			ws_demand_facing(_G(my_walker), 3);
 			other_save_game_for_resurrection();
-			_G(game).new_section = 4;
-			_G(game).new_room = 413;
+			_G(game).setRoom(413);
 
 			break;
 
diff --git a/engines/m4/riddle/rooms/section8/room807.cpp b/engines/m4/riddle/rooms/section8/room807.cpp
index f2076608b58..88154fe5767 100644
--- a/engines/m4/riddle/rooms/section8/room807.cpp
+++ b/engines/m4/riddle/rooms/section8/room807.cpp
@@ -1024,8 +1024,7 @@ void Room807::daemon() {
 		_field38 = 1;
 		_G(flags)[V274] = 0;
 		other_save_game_for_resurrection();
-		_G(game).new_section = 4;
-		_G(game).new_room = 413;
+		_G(game).setRoom(413);
 
 		break;
 
diff --git a/engines/m4/riddle/rooms/section8/room808.cpp b/engines/m4/riddle/rooms/section8/room808.cpp
index a860a4fc874..5d1099dc6ed 100644
--- a/engines/m4/riddle/rooms/section8/room808.cpp
+++ b/engines/m4/riddle/rooms/section8/room808.cpp
@@ -1453,10 +1453,9 @@ void Room808::daemon() {
 			ws_unhide_walker(_G(my_walker));
 			ws_demand_location(_G(my_walker), 202, 179);
 			ws_demand_facing(_G(my_walker), 2);
-			other_save_game_for_resurrection();
 
-			_G(game).new_section = 4;
-			_G(game).new_room = 413;
+			other_save_game_for_resurrection();
+			_G(game).setRoom(413);
 		}
 
 		break;
@@ -1690,9 +1689,9 @@ void Room808::daemon() {
 		ws_unhide_walker(_G(my_walker));
 		ws_demand_location(_G(my_walker), 202, 179);
 		ws_demand_facing(_G(my_walker), 2);
+
 		other_save_game_for_resurrection();
-		_G(game).section_id = 4;
-		_G(game).new_room = 413;
+		_G(game).setRoom(413);
 
 		break;