[Scummvm-git-logs] scummvm master -> 30a1cf25a4a9a068adc8b63d6e5bd0bbf63f1e0b

[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:
30a1cf25a4 M4: Riddle: Fix several PVS V560 in rooms 202, 203 and 407, add some constness


Commit: 30a1cf25a4a9a068adc8b63d6e5bd0bbf63f1e0b
    https://github.com/scummvm/scummvm/commit/30a1cf25a4a9a068adc8b63d6e5bd0bbf63f1e0b
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-06-18T06:21:16+01:00

Commit Message:
M4: Riddle: Fix several PVS V560 in rooms 202, 203 and 407, add some constness

Changed paths:
    engines/m4/riddle/rooms/section2/room202.cpp
    engines/m4/riddle/rooms/section2/room203.cpp
    engines/m4/riddle/rooms/section4/room407.cpp


diff --git a/engines/m4/riddle/rooms/section2/room202.cpp b/engines/m4/riddle/rooms/section2/room202.cpp
index 6b0d393a107..88a542633fc 100644
--- a/engines/m4/riddle/rooms/section2/room202.cpp
+++ b/engines/m4/riddle/rooms/section2/room202.cpp
@@ -137,7 +137,7 @@ void Room202::parser() {
 		_G(game).setRoom(203);
 	} else if (lookFlag && _G(walker).ripley_said(SAID)) {
 		// No implementation
-	} else if (player_said("journal") && !takeFlag && !lookFlag) {
+	} else if (player_said("journal") && !lookFlag) {
 		digi_play("202r16", 1);
 	} else {
 		return;
diff --git a/engines/m4/riddle/rooms/section2/room203.cpp b/engines/m4/riddle/rooms/section2/room203.cpp
index 548fb617785..4745247a55b 100644
--- a/engines/m4/riddle/rooms/section2/room203.cpp
+++ b/engines/m4/riddle/rooms/section2/room203.cpp
@@ -1557,7 +1557,7 @@ void Room203::daemon() {
 	case 126:
 		switch (_gkMode) {
 		case 3000:
-			if (_gkShould == 3000 && _gkMode == 3000 && _trigger1 != -1) {
+			if (_gkShould == 3000 && _trigger1 != -1) {
 				kernel_trigger_dispatchx(_trigger1);
 				_trigger1 = -1;
 			}
diff --git a/engines/m4/riddle/rooms/section4/room407.cpp b/engines/m4/riddle/rooms/section4/room407.cpp
index f4acfeb24e3..b48771dd9f8 100644
--- a/engines/m4/riddle/rooms/section4/room407.cpp
+++ b/engines/m4/riddle/rooms/section4/room407.cpp
@@ -1587,9 +1587,9 @@ void Room407::daemon() {
 }
 
 void Room407::pre_parser() {
-	bool lookFlag = player_said_any("look", "look at");
-	bool takeFlag = player_said("take");
-	bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
+	const bool lookFlag = player_said_any("look", "look at");
+	const bool takeFlag = player_said("take");
+	const bool useFlag = player_said_any("push", "pull", "gear", "open", "close");
 
 	if ((player_said("SURGICAL TUBE", "FAUCET PIPE") || player_said("TUBE/HOSE", "FAUCET PIPE")) &&
 			_faucetPipeState == 1100) {
@@ -2024,19 +2024,15 @@ void Room407::parser() {
 			_airValveState == 1100 && inv_object_is_here("FAUCET HANDLE")) {
 		if (_frotz2) {
 			digi_play("407r99e", 1);
-		} else if (_faucetPipeState == 1100) {
-			if (_periodicTableState == 1120)
-				digi_play("407r99o", 1);
-			else
-				useFaucet();
-		} else if (_tubeState == 1130 && _faucetPipeState != 1130) {
+		} else if (_faucetPipeState == 1100 || (_tubeState == 1130 && _faucetPipeState != 1130)) {
 			if (_periodicTableState == 1120)
 				digi_play("407r99o", 1);
 			else
 				useFaucet();
 		} else if (_faucetHookedToJar) {
 			useFaucet();
-		} else if (_faucetPipeState == 1100 || _tubeState == 1130 || _faucetHookedToJar) {
+		} else if (_tubeState == 1130) {
+			// The original is doing two additional checks on _faucetHookedToJar and (_faucetPipeState == 1100 which are useless at this point (already covered)
 			digi_play("407r99e", 1);
 		} else {
 			digi_play("407r99n", 1);