[Scummvm-git-logs] scummvm master -> 5f395b03feb98c78da6387739c7eedfd39f14e03

[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:
5f395b03fe M4: Riddle: Review DIRS and NAMES initializations in room group 2 to 4 (fix PVS Studio V1009 in room 204)


Commit: 5f395b03feb98c78da6387739c7eedfd39f14e03
    https://github.com/scummvm/scummvm/commit/5f395b03feb98c78da6387739c7eedfd39f14e03
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-06-20T05:44:30+01:00

Commit Message:
M4: Riddle: Review DIRS and NAMES initializations in room group 2 to 4 (fix PVS Studio V1009 in room 204)

Changed paths:
    engines/m4/adv_r/adv_walk.cpp
    engines/m4/riddle/rooms/section2/room202.cpp
    engines/m4/riddle/rooms/section2/room203.cpp
    engines/m4/riddle/rooms/section2/room204.cpp
    engines/m4/riddle/rooms/section4/room413.cpp


diff --git a/engines/m4/adv_r/adv_walk.cpp b/engines/m4/adv_r/adv_walk.cpp
index 743ed22aaee..5157125ad0e 100644
--- a/engines/m4/adv_r/adv_walk.cpp
+++ b/engines/m4/adv_r/adv_walk.cpp
@@ -422,12 +422,11 @@ bool ws_walk_load_series(const int16 *dir_array, const char *name_array[], bool
 	int32 i = 0;
 
 	while (dir_array[i] >= 0) {
-		int32 result = AddWSAssetCELS(name_array[i], dir_array[i],
-			(load_palette && !shadow_flag) ? _G(master_palette) : nullptr);
-		if (result < 0) {
+		const int32 result = AddWSAssetCELS(name_array[i], dir_array[i],
+		                                    (load_palette && !shadow_flag) ? _G(master_palette) : nullptr);
+		if (result < 0)
 			error_show(FL, 'W:-(');
-			return false;
-		}
+
 		i++;
 	}
 
diff --git a/engines/m4/riddle/rooms/section2/room202.cpp b/engines/m4/riddle/rooms/section2/room202.cpp
index 88a542633fc..ca033596cab 100644
--- a/engines/m4/riddle/rooms/section2/room202.cpp
+++ b/engines/m4/riddle/rooms/section2/room202.cpp
@@ -99,9 +99,9 @@ void Room202::pre_parser() {
 }
 
 void Room202::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 (lookFlag && player_said("TRADER'S STALL") && _G(flags)[V065] == 1) {
 		digi_play("202r01", 1);
diff --git a/engines/m4/riddle/rooms/section2/room203.cpp b/engines/m4/riddle/rooms/section2/room203.cpp
index 4745247a55b..535d53e77d3 100644
--- a/engines/m4/riddle/rooms/section2/room203.cpp
+++ b/engines/m4/riddle/rooms/section2/room203.cpp
@@ -32,13 +32,9 @@ namespace Riddle {
 namespace Rooms {
 
 const int16 OFFICIAL_NORMAL_DIRS[] = { 200, 201, 202, -1 };
-const char *OFFICIAL_NORMAL_NAMES[] = {
-	"official walk pos11", "official walk pos9", "official walk pos7"
-};
+const char *OFFICIAL_NORMAL_NAMES[] = { "official walk pos11", "official walk pos9", "official walk pos7" };
 const int16 OFFICIAL_SHADOW_DIRS[] = { 210, 211, 212, -1 };
-const char *OFFICIAL_SHADOW_NAMES[] = {
-	"203of09s", "203of04s", "203of12s"
-};
+const char *OFFICIAL_SHADOW_NAMES[] = { "203of09s", "203of04s", "203of12s" };
 
 const int16 SNORMAL1_DIRS[] = { 200, -1 };
 const char *SNORMAL1_NAMES[] = { "203s01" };
diff --git a/engines/m4/riddle/rooms/section2/room204.cpp b/engines/m4/riddle/rooms/section2/room204.cpp
index 87e61a03cec..f751dd769d4 100644
--- a/engines/m4/riddle/rooms/section2/room204.cpp
+++ b/engines/m4/riddle/rooms/section2/room204.cpp
@@ -31,12 +31,10 @@ namespace M4 {
 namespace Riddle {
 namespace Rooms {
 
-const int16 ROOM204_NORMAL_DIRS[] = {
-	200, -1, -1};
-const int16 ROOM204_SHADOW_DIRS[6] = {
-	210, -1, -1};
-static const char *ROOM204_NORMAL_NAMES[5] = { "priest walker" };
-static const char *ROOM204_SHADOW_NAMES[5] = { "kuangs shadow 2" };
+const int16 ROOM204_NORMAL_DIRS[] = { 200, -1};
+const int16 ROOM204_SHADOW_DIRS[] = { 210, -1};
+static const char *ROOM204_NORMAL_NAMES[] = { "priest walker" };
+static const char *ROOM204_SHADOW_NAMES[] = { "kuangs shadow 2" };
 
 
 void Room204::preload() {
diff --git a/engines/m4/riddle/rooms/section4/room413.cpp b/engines/m4/riddle/rooms/section4/room413.cpp
index 2e4640bca71..cdeefa488c6 100644
--- a/engines/m4/riddle/rooms/section4/room413.cpp
+++ b/engines/m4/riddle/rooms/section4/room413.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "m4/riddle/rooms/section4/room413.h"
-#include "m4/graphics/gr_series.h"
 #include "m4/riddle/vars.h"
 
 namespace M4 {