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

[Strangerke]

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

Summary:
ae310ae2f2 M4: RIDDLE: Fix broken animation when pushing the right tablet for the first time (room 205)
6fbd409fa8 M4: RIDDLE: Fix looping metallic noise when using the gong on the brazier (room 205)
e6d0409be7 M4: RIDDLE: small cleanup in room 205


Commit: ae310ae2f2646201642a9518d6c7c37da1a3a6fd
    https://github.com/scummvm/scummvm/commit/ae310ae2f2646201642a9518d6c7c37da1a3a6fd
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-08T22:07:56+01:00

Commit Message:
M4: RIDDLE: Fix broken animation when pushing the right tablet for the first time (room 205)

Changed paths:
    engines/m4/riddle/rooms/section2/room205.cpp


diff --git a/engines/m4/riddle/rooms/section2/room205.cpp b/engines/m4/riddle/rooms/section2/room205.cpp
index db75d2b6bc9..832794285a4 100644
--- a/engines/m4/riddle/rooms/section2/room205.cpp
+++ b/engines/m4/riddle/rooms/section2/room205.cpp
@@ -438,7 +438,7 @@ void Room205::parser() {
 				_fieldDC = 1;
 				digi_preload("205_S30", -1);
 				digi_preload("205R34", -1);
-				ws_unhide_walker(_G(my_walker));
+				ws_hide_walker(_G(my_walker));
 				series_stream("205RTEST", 7, 0, 7);
 				kernel_timing_trigger(240, 5, nullptr);
 			} else if (!_G(flags)[V024]) {


Commit: 6fbd409fa88a5ecb0fa4282f560bab63c64d9c1d
    https://github.com/scummvm/scummvm/commit/6fbd409fa88a5ecb0fa4282f560bab63c64d9c1d
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-08T22:07:56+01:00

Commit Message:
M4: RIDDLE: Fix looping metallic noise when using the gong on the brazier (room 205)

Changed paths:
    engines/m4/riddle/rooms/section2/room205.cpp


diff --git a/engines/m4/riddle/rooms/section2/room205.cpp b/engines/m4/riddle/rooms/section2/room205.cpp
index 832794285a4..bfa26005dff 100644
--- a/engines/m4/riddle/rooms/section2/room205.cpp
+++ b/engines/m4/riddle/rooms/section2/room205.cpp
@@ -196,7 +196,7 @@ void Room205::parser() {
 				series_unload(_205FireInBrazierSeries);
 				series_show("205GONG", 1025, 16, -1, -1, 0, 100, 0, 0);
 				digi_play_loop("205_s34", 3, 25, -1, -1);
-				digi_play_loop("205_S23", 1, 255, -1, -1);
+				digi_play("205_S23", 1, 255, -1, -1);
 				hotspot_set_active(_G(currentSceneDef).hotspots, "GONG ", true);
 				hotspot_set_active(_G(currentSceneDef).hotspots, "GUN", false);
 				inv_move_object("GONG", 999);


Commit: e6d0409be74203602c556b4c272fed257b7c5db6
    https://github.com/scummvm/scummvm/commit/e6d0409be74203602c556b4c272fed257b7c5db6
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-08T22:07:56+01:00

Commit Message:
M4: RIDDLE: small cleanup in room 205

Changed paths:
    engines/m4/riddle/rooms/section2/room205.cpp


diff --git a/engines/m4/riddle/rooms/section2/room205.cpp b/engines/m4/riddle/rooms/section2/room205.cpp
index bfa26005dff..fec5d26541d 100644
--- a/engines/m4/riddle/rooms/section2/room205.cpp
+++ b/engines/m4/riddle/rooms/section2/room205.cpp
@@ -176,9 +176,9 @@ void Room205::pre_parser() {
 }
 
 void Room205::parser() {
-	bool lookFl = player_said_any("look", "look at");
-	bool takeFl = player_said("take");
-	bool gearFl = player_said("gear");
+	const bool lookFl = player_said_any("look", "look at");
+	const bool takeFl = player_said("take");
+	const bool gearFl = player_said("gear");
 
 	if (player_said("GONG", "BRAZIER") || player_said("GONG", "GUN")) {
 		if (!_G(flags)[V024]) {
@@ -1732,7 +1732,7 @@ void Room205::daemon() {
 			series_unload(_205Fite4Series);
 			_205all7Series = series_load("205ALL7", -1, nullptr);
 			_fieldDC = 0;
-			ws_walk(_G(my_walker), 482, 351, 0, 1016, 3, true);
+			ws_walk(_G(my_walker), 482, 351, nullptr, 1016, 3, true);
 		}
 		break;