[Scummvm-git-logs] scummvm master -> 19ef645fab675b555e54f761ac59f465c1916d12

[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:
19ef645fab M4: RIDDLE: Small janitorial work in rooms 301, 303 and 305


Commit: 19ef645fab675b555e54f761ac59f465c1916d12
    https://github.com/scummvm/scummvm/commit/19ef645fab675b555e54f761ac59f465c1916d12
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-24T08:26:07+01:00

Commit Message:
M4: RIDDLE: Small janitorial work in rooms 301, 303 and 305

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


diff --git a/engines/m4/riddle/rooms/section3/room301.cpp b/engines/m4/riddle/rooms/section3/room301.cpp
index 3c89d8d14ce..ef934a5abbe 100644
--- a/engines/m4/riddle/rooms/section3/room301.cpp
+++ b/engines/m4/riddle/rooms/section3/room301.cpp
@@ -65,7 +65,7 @@ void Room301::init() {
 	_agentTakesTelegram = series_load("agent takes telegram from slot");
 	_agentTalk = series_load("agent animated talk disp");
 	_agentSalutes = series_load("agent salutes rip");
-	_george = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+	_george = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
 		triggerMachineByHashCallback, "guy behind desk");
 
 	sendWSMessage(1, _george, _agentStander, 1, 1, 10, _agentStander, 1, 1, 0);
@@ -103,7 +103,7 @@ void Room301::daemon() {
 		break;
 
 	case 9:
-		_george = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+		_george = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
 			triggerMachineByHashCallback, "guy behind desk");
 		_georgeShould = _georgeMode = 0;
 		sendWSMessage_10000(1, _george, _agentStander, 1,
@@ -431,6 +431,9 @@ void Room301::daemon() {
 				_convResumeFlag = true;
 			}
 			break;
+			
+		default:
+			break;
 		}
 		break;
 
@@ -446,7 +449,7 @@ void Room301::daemon() {
 		break;
 
 	case 13:
-		_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+		_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
 			triggerMachineByHashCallback, "rip in conv");
 		sendWSMessage_10000(1, _ripley, _ripTrekTravel, 10, 10, 20,
 			_ripTrekTravel, 10, 10, 0);
@@ -744,7 +747,7 @@ void Room301::daemon() {
 
 	case 300:
 		terminateMachineAndNull(_george);
-		_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+		_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
 			triggerMachineByHashCallback, "rip");
 		sendWSMessage_10000(1, _ripley, _agentStander, 7,
 			1, 304, _agentStander, 1, 1, 0);
@@ -769,7 +772,7 @@ void Room301::daemon() {
 	case 322:
 		sendWSMessage_10000(1, _ripley, _ripTrekTravel,
 			10, 1, 324, _ripTrekTravel, 1, 1, 0);
-		_george = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+		_george = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
 			triggerMachineByHashCallback, "guy behind desk");
 		_georgeShould = 0;
 		_georgeMode = 0;
@@ -784,8 +787,8 @@ void Room301::daemon() {
 		break;
 
 	case 990:
-		_digiSound1 = _digiSound2 = 0;
-		_digiSound3 = _digiSound4 = 0;
+		_digiSound1 = _digiSound2 = nullptr;
+		_digiSound3 = _digiSound4 = nullptr;
 
 		if (_val12 <= 0) {
 			kernel_timing_trigger(1, 320);
@@ -899,7 +902,7 @@ void Room301::parser() {
 				ws_walk(_G(my_walker), 200, 269, nullptr, 1, 9);
 			} else if (_G(kernel).trigger == 1) {
 				_G(kernel).trigger_mode = KT_DAEMON;
-				_machine2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+				_machine2 = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
 					triggerMachineByHashCallback, "marshal");
 				sendWSMessage(1, _machine2, _marshalMatt, 1, 2, 202, _marshalMatt, 3, 3, 0);
 				_val17 = 0;
@@ -1011,7 +1014,7 @@ void Room301::parser() {
 
 		_machine3 = series_show("safari shadow 3", 0xf00, 0, -1, -1, 0,
 			_G(player_info).scale, _G(player_info).x, _G(player_info).y);
-		_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, 0,
+		_ripley = TriggerMachineByHash(1, 1, 0, 0, 0, 0, 0, 0, 100, 0x400, false,
 			triggerMachineByHashCallback, "rip");
 
 		_G(kernel).trigger_mode = KT_DAEMON;
@@ -1042,8 +1045,8 @@ void Room301::parser() {
 
 void Room301::conv301a() {
 	const char *sound = conv_sound_to_play();
-	int who = conv_whos_talking();
-	int node = conv_current_node();
+	const int who = conv_whos_talking();
+	const int node = conv_current_node();
 
 	if (_G(kernel).trigger == 1) {
 		if (who <= 0) {
diff --git a/engines/m4/riddle/rooms/section3/room303.cpp b/engines/m4/riddle/rooms/section3/room303.cpp
index af07d6cc9af..8b0ee8d1bd0 100644
--- a/engines/m4/riddle/rooms/section3/room303.cpp
+++ b/engines/m4/riddle/rooms/section3/room303.cpp
@@ -233,7 +233,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, 16, 400,
 				_feng4, 1, 6, 0);
@@ -1920,7 +1920,9 @@ void Room303::conv303b() {
 				_ripPonders = series_stream("303pu01", 4, 0x100, 666);
 				series_stream_break_on_frame(_ripPonders, 5, 700);
 				return;
-			} else if (node == 1 && entry == 2) {
+			}
+
+			if (node == 1 && entry == 2) {
 				// No implementation
 			} else if ((node == 2 && entry == 0) || (node == 2 && entry == 2)) {
 				_ripleyShould = 3;
diff --git a/engines/m4/riddle/rooms/section3/room305.cpp b/engines/m4/riddle/rooms/section3/room305.cpp
index 54205cb62c3..780404822fd 100644
--- a/engines/m4/riddle/rooms/section3/room305.cpp
+++ b/engines/m4/riddle/rooms/section3/room305.cpp
@@ -712,7 +712,6 @@ void Room305::parser() {
 				break;
 			default:
 				goto next1;
-				break;
 			}
 		}
 	} else {
@@ -800,7 +799,6 @@ next2:
 
 		default:
 			goto next3;
-			break;
 		}
 	} else {
 		goto next3;
@@ -883,7 +881,6 @@ next3:
 
 		default:
 			goto next4;
-			break;
 		}
 	} else {
 		goto next4;