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

[Strangerke]

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

Summary:
ae2d84929d M4: RIDDLE: Room 303 - some cleanup : use boolean values where they should be used, add some const
e7c31f2b51 M4: RIDDLE: Room 305: Fix a crash when looking at the shark


Commit: ae2d84929d8a9bc73644628824873f347297701d
    https://github.com/scummvm/scummvm/commit/ae2d84929d8a9bc73644628824873f347297701d
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-21T00:08:57+01:00

Commit Message:
M4: RIDDLE: Room 303 - some cleanup : use boolean values where they should be used, add some const

Changed paths:
    engines/m4/riddle/rooms/section3/room303.cpp


diff --git a/engines/m4/riddle/rooms/section3/room303.cpp b/engines/m4/riddle/rooms/section3/room303.cpp
index 459166bf5c1..eac7f6059c9 100644
--- a/engines/m4/riddle/rooms/section3/room303.cpp
+++ b/engines/m4/riddle/rooms/section3/room303.cpp
@@ -107,11 +107,11 @@ void Room303::init() {
 			loadFengLi();
 
 			if (_fengFlag) {
-				_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 480, 256, 86, 0xc00, 1,
+				_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 480, 256, 86, 0xc00, true,
 					triggerMachineByHashCallback, "fl");
 				setShadow5(true);
 			} else {
-				_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 706, 256, 86, 0xc00, 0,
+				_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 706, 256, 86, 0xc00, false,
 					triggerMachineByHashCallback, "fl state machine");
 				setShadow5(false);
 			}
@@ -290,7 +290,7 @@ void Room303::init() {
 
 		_fengFlag = true;
 		loadFengLi();
-		_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 480, 256, 86, 0xc00, 1,
+		_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 480, 256, 86, 0xc00, true,
 			triggerMachineByHashCallback, "fl");
 		sendWSMessage_10000(1, _fengLi, _feng4, 1, 1, 400, _feng4, 1, 6, 0);
 		_fengMode = _fengShould = 1;
@@ -385,7 +385,7 @@ void Room303::daemon() {
 
 	case 40:
 		sendWSMessage_60000(_fengLi);
-		_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 480, 256, 86, 0xc00, 1,
+		_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 480, 256, 86, 0xc00, true,
 			triggerMachineByHashCallback, "fl");
 		sendWSMessage_10000(1, _fengLi, _feng1, 1, 16, 400,
 			_feng4, 1, 6, 0);
@@ -1153,7 +1153,7 @@ void Room303::pre_parser() {
 }
 
 void Room303::parser() {
-	bool lookFlag = player_said_any("look", "look at");
+	const bool lookFlag = player_said_any("look", "look at");
 
 	if (player_said("conv303b")) {
 		conv303b();
@@ -1177,7 +1177,7 @@ void Room303::parser() {
 
 		case 2:
 			setShadow5Alt(true);
-			_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 706, 256, 86, 0xc00, 0,
+			_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 706, 256, 86, 0xc00, false,
 				triggerMachineByHashCallback, "fl state machine");
 
 			_G(kernel).trigger_mode = KT_DAEMON;
@@ -1206,7 +1206,7 @@ void Room303::parser() {
 		case 2:
 			setShadow5(true);
 			sendWSMessage_60000(_fengLi);
-			_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 480, 256, 86, 0xc00, 1,
+			_fengLi = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 480, 256, 86, 0xc00, true,
 				triggerMachineByHashCallback, "fl state machine");
 
 			_G(kernel).trigger_mode = KT_DAEMON;
@@ -1642,7 +1642,7 @@ void Room303::parser() {
 			_G(player_info).scale, _G(player_info).x, _G(player_info).y);
 		_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0,
 			_G(player_info).x, _G(player_info).y, _G(player_info).scale + 1,
-			0x500, 1, triggerMachineByHashCallback, "rip");
+			0x500, true, triggerMachineByHashCallback, "rip");
 
 		_G(kernel).trigger_mode = KT_DAEMON;
 		sendWSMessage_10000(1, _ripley, 1, 1, 1, 300, 1, 1, 1, 0);
@@ -1753,7 +1753,7 @@ void Room303::setupMei() {
 	_mei1 = series_load("MC NY hands behind back pos4");
 	_mei2 = series_load("MC NY hand on hip pos4");
 	_mei3 = series_load("MC NY hand out talk pos4");
-	_mei = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 357, 255, 86, 0xf00, 0,
+	_mei = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 357, 255, 86, 0xf00, false,
 		triggerMachineByHashCallback, "mc");
 
 	_G(kernel).trigger_mode = KT_DAEMON;
@@ -1875,9 +1875,9 @@ void Room303::conv303a() {
 }
 
 void Room303::conv303b() {
-	int who = conv_whos_talking();
-	int node = conv_current_node();
-	int entry = conv_current_entry();
+	const int who = conv_whos_talking();
+	const int node = conv_current_node();
+	const int entry = conv_current_entry();
 	const char *sound = conv_sound_to_play();
 
 	switch (_G(kernel).trigger) {
@@ -2048,7 +2048,7 @@ void Room303::playSound(const Common::String &assetName, int trigger1, int trigg
 	if (!trigger2)
 		trigger2 = -1;
 
-	int size = MAX(getSize(assetName), 0);
+	const int size = MAX(getSize(assetName), 0);
 	_G(globals)[GLB_TEMP_1] = size << 16;
 	_G(globals)[GLB_TEMP_2] = trigger2 << 16;
 	sendWSMessage(0x200000, 0, _priestTalk, 0, nullptr, 1);


Commit: e7c31f2b51e4e721f02b3c71d7e9c094ec754c8a
    https://github.com/scummvm/scummvm/commit/e7c31f2b51e4e721f02b3c71d7e9c094ec754c8a
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-21T00:09:20+01:00

Commit Message:
M4: RIDDLE: Room 305: Fix a crash when looking at the shark

Changed paths:
    engines/m4/riddle/rooms/section3/room305.cpp


diff --git a/engines/m4/riddle/rooms/section3/room305.cpp b/engines/m4/riddle/rooms/section3/room305.cpp
index df69dbff583..54205cb62c3 100644
--- a/engines/m4/riddle/rooms/section3/room305.cpp
+++ b/engines/m4/riddle/rooms/section3/room305.cpp
@@ -1151,6 +1151,7 @@ next4:
 
 		case 3:
 			series_unload(_lookUp);
+			player_set_commands_allowed(true);
 			break;
 
 		default: