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

[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:
3743b53814 M4: RIDDLE: Janitorial work in room805
c19674a392 M4: RIDDLE: Fix for #16467 - Crash when pushing the chariot in the corridor when _G(flags)[V265] is not set (plus one ot
ba1451e032 M4: RIDDLE: Remove old debug trace forgotten in room 806


Commit: 3743b53814db905aac3c676855c679c2ce145766
    https://github.com/scummvm/scummvm/commit/3743b53814db905aac3c676855c679c2ce145766
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-22T06:47:00+01:00

Commit Message:
M4: RIDDLE: Janitorial work in room805

Changed paths:
    engines/m4/riddle/rooms/section8/room805.cpp


diff --git a/engines/m4/riddle/rooms/section8/room805.cpp b/engines/m4/riddle/rooms/section8/room805.cpp
index 43d1e93799a..d48b72f29fd 100644
--- a/engines/m4/riddle/rooms/section8/room805.cpp
+++ b/engines/m4/riddle/rooms/section8/room805.cpp
@@ -169,8 +169,7 @@ void Room805::initHotspots() {
 		hotspot_set_active(_G(currentSceneDef).hotspots, "JADE DOOR ", false);
 
 	if (!player_been_here(805))
-		_G(flags)
-		[V262] = 0;
+		_G(flags)[V262] = 0;
 
 	if (_G(flags)[V270] == 805 && _G(flags)[V262] == 1) {
 		_chariotRestMach = series_play("805 CHARIOT REST", 1280, 0, -1, 0, -1, 100, 0, 0, 0, -1);


Commit: c19674a392f9ad1ff9da9af364af7fa5a38bb7c3
    https://github.com/scummvm/scummvm/commit/c19674a392f9ad1ff9da9af364af7fa5a38bb7c3
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-22T06:47:01+01:00

Commit Message:
M4: RIDDLE: Fix for #16467 - Crash when pushing the chariot in the corridor when _G(flags)[V265] is not set (plus one other bug)

Changed paths:
    engines/m4/riddle/rooms/section8/room806.cpp


diff --git a/engines/m4/riddle/rooms/section8/room806.cpp b/engines/m4/riddle/rooms/section8/room806.cpp
index 8567fee71f3..2e8ca845120 100644
--- a/engines/m4/riddle/rooms/section8/room806.cpp
+++ b/engines/m4/riddle/rooms/section8/room806.cpp
@@ -154,14 +154,18 @@ void Room806::init() {
 			if (!_G(flags)[V265]) {
 				ws_walk(_G(my_walker), 221, 316, nullptr, 12001, 3, true);
 			} else {
-				if (!player_been_here(809))
-					kernel_timing_trigger(imath_ranged_rand(1200, 1800), 201, nullptr);
-
-				kernel_timing_trigger(imath_ranged_rand(1200, 1800), 701, nullptr);
+				ws_walk(_G(my_walker), 221, 316, nullptr, 999, 3, true);
+				
+				if (!_G(flags)[V276]) {
+					if (!player_been_here(809))
+						kernel_timing_trigger(imath_ranged_rand(1200, 1800), 201, nullptr);
+
+					kernel_timing_trigger(imath_ranged_rand(1200, 1800), 701, nullptr);
+				}
 			}
 
 			if (!_G(flags)[V276])
-				sendWSMessage_10000(_mcTrekMach, 30, 296, 0, 501, 1);
+				sendWSMessage_10000(_mcTrekMach, 30, 296, 0, 501, 0);
 
 		} else if (!_G(flags)[V265]) {
 			sendWSMessage_10000(_mcTrekMach, 225, 306, 3, 101, 1);


Commit: ba1451e0327736352b18265b74884a0867fc58c9
    https://github.com/scummvm/scummvm/commit/ba1451e0327736352b18265b74884a0867fc58c9
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-22T06:50:16+01:00

Commit Message:
M4: RIDDLE: Remove old debug trace forgotten in room 806

Changed paths:
    engines/m4/riddle/rooms/section8/room806.cpp


diff --git a/engines/m4/riddle/rooms/section8/room806.cpp b/engines/m4/riddle/rooms/section8/room806.cpp
index 2e8ca845120..9983aee2151 100644
--- a/engines/m4/riddle/rooms/section8/room806.cpp
+++ b/engines/m4/riddle/rooms/section8/room806.cpp
@@ -1115,7 +1115,6 @@ void Room806::parser() {
 }
 
 void Room806::daemon() {
-	warning("Trigger %d", _G(kernel).trigger);
 	switch (_G(kernel).trigger) {
 	case 101:
 		ws_hide_walker(_mcTrekMach);