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

[dreammaster]

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

Summary:
fa901f6003 M4: RIDDLE: Post-god Twelvetree conv fixes


Commit: fa901f600376f87f5b7782fef324e62aba443941
    https://github.com/scummvm/scummvm/commit/fa901f600376f87f5b7782fef324e62aba443941
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-01-28T21:04:55-08:00

Commit Message:
M4: RIDDLE: Post-god Twelvetree conv fixes

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


diff --git a/engines/m4/riddle/console.cpp b/engines/m4/riddle/console.cpp
index d548d8ba963..f4e6e585784 100644
--- a/engines/m4/riddle/console.cpp
+++ b/engines/m4/riddle/console.cpp
@@ -30,6 +30,8 @@ Console::Console() : M4::Console() {
 	registerCmd("global", WRAP_METHOD(Console, cmdGlobal));
 	registerCmd("kitty",  WRAP_METHOD(Console, cmdKittyScreaming));
 	registerCmd("start",  WRAP_METHOD(Console, cmdStart));
+	registerCmd("restoreconv", WRAP_METHOD(Console, cmdRestoreConv));
+
 }
 
 bool Console::cmdGlobal(int argc, const char **argv) {
@@ -66,5 +68,11 @@ bool Console::cmdStart(int argc, const char **argv) {
 	return false;
 }
 
+bool Console::cmdRestoreConv(int argc, const char **argv) {
+	_GC(restore_conv) = false;
+	debugPrintf("Next conversation will not be restored.\n");
+	return true;
+}
+
 } // End of namespace Riddle
 } // End of namespace M4
diff --git a/engines/m4/riddle/console.h b/engines/m4/riddle/console.h
index e02168ef6d7..74bec053a22 100644
--- a/engines/m4/riddle/console.h
+++ b/engines/m4/riddle/console.h
@@ -33,6 +33,7 @@ private:
 	bool cmdGlobal(int argc, const char **argv);
 	bool cmdKittyScreaming(int argc, const char **argv);
 	bool cmdStart(int argc, const char **argv);
+	bool cmdRestoreConv(int argc, const char **argv);
 
 public:
 	Console();
diff --git a/engines/m4/riddle/rooms/section6/room603.cpp b/engines/m4/riddle/rooms/section6/room603.cpp
index e9fef909c5b..5640cb5a42d 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -1115,7 +1115,7 @@ void Room603::daemon() {
 			}
 			break;
 
-		case 12:
+		case 18:
 			switch (_ttShould) {
 			case 7:
 			case 8:
@@ -1363,11 +1363,12 @@ void Room603::parser() {
 		_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 311, 308, -59, 0x100, 1,
 			triggerMachineByHashCallback, "rip");
 		_shadow = series_show("safari shadow 2", 0xf00, 128, -1, -1, 0, 59, 311, 308);
-		_G(kernel).trigger_mode = KT_DAEMON;
 
+		_G(kernel).trigger_mode = KT_DAEMON;
 		sendWSMessage_10000(1, _ripley, _ripTalk, 1, 1, 300, _ripTalk, 1, 1, 0);
 		sendWSMessage_190000(_ripley, 4);
 		_G(kernel).trigger_mode = KT_PARSE;
+
 		_ripleyMode = 0;
 		_ripleyShould = 0;
 		_ttShould = 7;
@@ -1398,7 +1399,7 @@ void Room603::parser() {
 				}
 			}
 
-			conv_export_value_curr(0, 1);
+			conv_export_value_curr(1, 1);
 			conv_export_value_curr(_G(flags)[V039], 6);
 			conv_play();
 		}
@@ -1857,7 +1858,7 @@ void Room603::conv603b() {
 	int entry = conv_current_entry();
 
 	if (_G(kernel).trigger == 1) {
-		if (!(node == 13 && entry == 16)) {
+		if (node != 13 && node != 16) {
 			if (who <= 0) {
 				if (node == 2 || node == 5 || node == 7)
 					_G(flags)[V038] = 1;
@@ -1893,7 +1894,7 @@ void Room603::conv603b() {
 				_ripleyShould = 5;
 		}
 
-		digi_play(sound, 1);
+		digi_play(sound, 1, 255, 1);
 	} else {
 		conv_resume();
 	}
diff --git a/engines/m4/riddle/rooms/section6/room608.cpp b/engines/m4/riddle/rooms/section6/room608.cpp
index ff1a633cd35..18276aa6948 100644
--- a/engines/m4/riddle/rooms/section6/room608.cpp
+++ b/engines/m4/riddle/rooms/section6/room608.cpp
@@ -145,7 +145,7 @@ void Room608::init() {
 			-30, 324, 3, triggerMachineByHashCallback3000, "tt walker");
 		sendWSMessage_10000(_tt, 105, 324, 5, 20, 1);
 	} else if (_G(flags)[V203] == 6) {
-		_tt02 = series_load("606TT02");
+		_tt02 = series_load("608TT02");
 		_tt03 = series_load("608TT03");
 		_tt05 = series_load("608TT05");
 		_ripHandChin = series_load("RIP TREK HAND CHIN POS3");