[Scummvm-git-logs] scummvm master -> 8c9551c8f8406a0562a8f42277d4f55fe3b7bb97

[Strangerke]

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

Summary:
8c9551c8f8 M4: RIDDLE: Fix logic (blocker) in room 801


Commit: 8c9551c8f8406a0562a8f42277d4f55fe3b7bb97
    https://github.com/scummvm/scummvm/commit/8c9551c8f8406a0562a8f42277d4f55fe3b7bb97
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-09T21:09:18+01:00

Commit Message:
M4: RIDDLE: Fix logic (blocker) in room 801

Changed paths:
    engines/m4/riddle/rooms/section8/room801.cpp
    engines/m4/riddle/rooms/section8/room801.h


diff --git a/engines/m4/riddle/rooms/section8/room801.cpp b/engines/m4/riddle/rooms/section8/room801.cpp
index 3e2ffe5c0d9..8abb167a6ab 100644
--- a/engines/m4/riddle/rooms/section8/room801.cpp
+++ b/engines/m4/riddle/rooms/section8/room801.cpp
@@ -463,6 +463,7 @@ void Room801::parser() {
 		}
 	}
 
+	// This blocks is when opening the cellar door
 	else if (gearFl && player_said("root cellar  ")) {
 		switch (_G(kernel).trigger) {
 		case -1:
@@ -503,6 +504,7 @@ void Room801::parser() {
 
 	else if (gearFl && player_said("root cellar ")) {
 	// Not the same as the previous one : there's one space instead of two at the end
+	// This blocks is when closing the cellar door which was previously opened
 		switch (_G(kernel).trigger) {
 		case -1:
 			if (_cellarOpenFl) {
@@ -820,7 +822,7 @@ void Room801::daemon() {
 		break;
 
 	case 32:
-		_cellarOpenFl = true;
+		_unkFlag3 = true;
 		break;
 
 	case 33:
@@ -828,8 +830,8 @@ void Room801::daemon() {
 		break;
 
 	case 34:
-		if (_cellarOpenFl) {
-			_cellarOpenFl = false;
+		if (_unkFlag3) {
+			_unkFlag3 = false;
 			sendWSMessage_10000(1, _mcTrekMach, _meiPrattleLoopSeries, 42, 42, 0, _meiPrattleLoopSeries, 42, 42, 0);
 			sendWSMessage_10000(1, _farmerDisplacementMach, _farmerTalkLoopSeries, 1, 4, 0, _farmerTalkLoopSeries, 5, 7, 4);
 			digi_play("801f01", 1, 255, 13, -1);
@@ -845,7 +847,7 @@ void Room801::daemon() {
 		break;
 
 	case 36:
-		if (_cellarOpenFl) {
+		if (_unkFlag3) {
 			sendWSMessage_10000(1, _mcTrekMach, _meiPrattleLoopSeries, 42, 42, -1, _meiPrattleLoopSeries, 42, 42, 0);
 		} else {
 			kernel_timing_trigger(15, 36, nullptr);
@@ -900,7 +902,7 @@ void Room801::daemon() {
 		break;
 
 	case 52:
-		if (_unkFlag2 && _unkFlag1 && _cellarOpenFl) {
+		if (_unkFlag2 && _unkFlag1 && _unkFlag3) {
 			terminateMachine(_mcTrekMach);
 			terminateMachine(_farmerDisplacementMach);
 			terminateMachine(_ripAnimationMach);
@@ -918,7 +920,7 @@ void Room801::daemon() {
 			digi_play("801m01", 1, 255, 34, -1);
 			_unkFlag1 = false;
 			_unkFlag2 = false;
-			_cellarOpenFl = false;
+			_unkFlag3 = false;
 		} else {
 			kernel_timing_trigger(15, 52, nullptr);
 		}
diff --git a/engines/m4/riddle/rooms/section8/room801.h b/engines/m4/riddle/rooms/section8/room801.h
index f6026fa66b0..808c5eaed1a 100644
--- a/engines/m4/riddle/rooms/section8/room801.h
+++ b/engines/m4/riddle/rooms/section8/room801.h
@@ -79,6 +79,7 @@ private:
 
 	bool _unkFlag1 = false;
 	bool _unkFlag2 = false;
+	bool _unkFlag3 = false;
 	bool _cellarOpenFl = false;
 
 	machine *_cellarDoorClosedMach = nullptr;