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

[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:
d2618d0ea8 M4: RIDDLE: Some cleanup in room 703, fix broken animation (blocker) in room 703, 705 and 706


Commit: d2618d0ea8091bc10b6e37576383c7c79d8e9bb7
    https://github.com/scummvm/scummvm/commit/d2618d0ea8091bc10b6e37576383c7c79d8e9bb7
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-04-05T06:14:07+01:00

Commit Message:
M4: RIDDLE: Some cleanup in room 703, fix broken animation (blocker) in room 703, 705 and 706

Changed paths:
    engines/m4/riddle/rooms/section7/room703.cpp
    engines/m4/riddle/rooms/section7/room705.cpp
    engines/m4/riddle/rooms/section7/room706.cpp


diff --git a/engines/m4/riddle/rooms/section7/room703.cpp b/engines/m4/riddle/rooms/section7/room703.cpp
index bcd4ee83807..bb447ba900d 100644
--- a/engines/m4/riddle/rooms/section7/room703.cpp
+++ b/engines/m4/riddle/rooms/section7/room703.cpp
@@ -139,10 +139,10 @@ void Room703::pre_parser() {
 }
 
 void Room703::parser() {
-	bool lookFl = player_said_any("look", "look at");
-	bool talkFl = player_said_any("talk", "talk to");
-	bool takeFl = player_said("take");
-	bool gearFl = player_said_any("push", "pull", "gear", "open", "close");
+	const bool lookFl = player_said_any("look", "look at");
+	const bool talkFl = player_said_any("talk", "talk to");
+	const bool takeFl = player_said("take");
+	const bool gearFl = player_said_any("push", "pull", "gear", "open", "close");
 
 	if (player_said("conv703a")) {
 		if (_G(kernel).trigger == 90)
@@ -372,7 +372,7 @@ void Room703::parser() {
 
 			case 3:
 			case 9:
-				_ripLooksDownSeries = series_load("RIP LOOKS DOWN POS3", -1, nullptr);
+				_ripLooksDownSeries = series_load("RIP TREK LOOK DOWN POS3", -1, nullptr);
 				keyValue = 22;
 
 				break;
diff --git a/engines/m4/riddle/rooms/section7/room705.cpp b/engines/m4/riddle/rooms/section7/room705.cpp
index 4802b6dd481..789bc7620c9 100644
--- a/engines/m4/riddle/rooms/section7/room705.cpp
+++ b/engines/m4/riddle/rooms/section7/room705.cpp
@@ -415,7 +415,7 @@ void Room705::parser() {
 
 			case 3:
 			case 9:
-				_ripLooksDownSeries = series_load("RIP LOOKS DOWN POS3", -1, nullptr);
+				_ripLooksDownSeries = series_load("RIP TREK LOOK DOWN POS3", -1, nullptr);
 				setGlobals1(_ripLooksDownSeries, 1, 11, 11, 11, 0, 11, 22, 22, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 				sendWSMessage_110000(_G(my_walker), 2);
 				break;
diff --git a/engines/m4/riddle/rooms/section7/room706.cpp b/engines/m4/riddle/rooms/section7/room706.cpp
index a8582f7b236..2ae91f58e27 100644
--- a/engines/m4/riddle/rooms/section7/room706.cpp
+++ b/engines/m4/riddle/rooms/section7/room706.cpp
@@ -348,7 +348,7 @@ void Room706::parser() {
 
 			case 3:
 			case 9:
-				_ripLooksDownSeries = series_load("RIP LOOKS DOWN POS3", -1, nullptr);
+				_ripLooksDownSeries = series_load("RIP TREK LOOK DOWN POS3", -1, nullptr);
 				setGlobals1(_ripLooksDownSeries, 1, 11, 11, 11, 0, 11, 22, 22, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 				sendWSMessage_110000(_G(my_walker), 2);