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

[Strangerke]

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:
e22d65d9c6 M4: RIDDLE: Fix some more dialogs in room 301, still not perfect.


Commit: e22d65d9c6c899ea8386f3c6cdf447425f7bebd6
    https://github.com/scummvm/scummvm/commit/e22d65d9c6c899ea8386f3c6cdf447425f7bebd6
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-24T00:24:29+01:00

Commit Message:
M4: RIDDLE: Fix some more dialogs in room 301, still not perfect.

Changed paths:
    engines/m4/riddle/rooms/section3/room301.cpp
    engines/m4/wscript/ws_machine.cpp


diff --git a/engines/m4/riddle/rooms/section3/room301.cpp b/engines/m4/riddle/rooms/section3/room301.cpp
index 065478530f4..3c89d8d14ce 100644
--- a/engines/m4/riddle/rooms/section3/room301.cpp
+++ b/engines/m4/riddle/rooms/section3/room301.cpp
@@ -117,7 +117,7 @@ void Room301::daemon() {
 				_trigger1 = -1;
 
 				if (_showWalkerFlag) {
-					ws_unhide_walker();
+					ws_unhide_walker(_G(my_walker));
 					_showWalkerFlag = false;
 				}
 			}
@@ -126,6 +126,7 @@ void Room301::daemon() {
 				conv_resume();
 				_convResumeFlag = false;
 			}
+
 			if (_msgRipleyFlag) {
 				sendWSMessage_80000(_ripley);
 				sendWSMessage_10000(1, _ripley, _ripTrekTravel, 10,
@@ -177,7 +178,9 @@ void Room301::daemon() {
 			case 1:
 			case 2:
 				sendWSMessage_10000(1, _george, _agentCheckingList,
-					1, 26, 10, _agentCheckingList, 27, 27, 0);
+									1, 26, 10, _agentCheckingList, 27, 27, 0);
+				_georgeShould = 1;
+				
 				break;
 
 			case 3:
@@ -625,6 +628,7 @@ void Room301::daemon() {
 		_G(global301) = 0;
 		setGlobals1(_ripTrekTalker3, 1, 1, 1, 5, 1);
 		sendWSMessage_110000(68);
+		_georgeMode = 8;
 		digi_play("301r01a", 1, 255, 68);
 		break;
 
@@ -632,7 +636,7 @@ void Room301::daemon() {
 		if (_G(global301) >= 1) {
 			_G(global301) = 0;
 			sendWSMessage_140000(-1);
-			_georgeMode = 0;
+			_georgeMode = 9;
 			_soundName = "301a04a";
 			_val16 = 70;
 		} else {
@@ -877,11 +881,11 @@ void Room301::pre_parser() {
 }
 
 void Room301::parser() {
-	auto oldMode = _G(kernel).trigger_mode;
-	bool lookFlag = player_said_any("look", "look at");		// ecx
-	bool talkFlag = player_said_any("talk", "talk to");
-	bool takeFlag = player_said("take");					// edi
-	bool useFlag = player_said_any("push", "pull", "gear", "open", "close"); // esi
+	const KernelTriggerType oldMode = _G(kernel).trigger_mode;
+	const bool lookFlag = player_said_any("look", "look at");		// ecx
+	const bool talkFlag = player_said_any("talk", "talk to");
+	const bool takeFlag = player_said("take");					// edi
+	const bool useFlag = player_said_any("push", "pull", "gear", "open", "close"); // esi
 
 	if (player_said("conv301a")) {
 		conv301a();
diff --git a/engines/m4/wscript/ws_machine.cpp b/engines/m4/wscript/ws_machine.cpp
index a1760c3abb4..deb76ba3a87 100644
--- a/engines/m4/wscript/ws_machine.cpp
+++ b/engines/m4/wscript/ws_machine.cpp
@@ -1058,7 +1058,7 @@ machine *TriggerMachineByHash(int32 myHash, Anim8 *parentAnim8, int32 dataHash,
 }
 
 machine *TriggerMachineByHash(MessageCB intrMsg, const char *machName) {
-	return TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+	return TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
 		intrMsg, machName);
 }