[Scummvm-git-logs] scummvm master -> 8c2c6ade6ade8e252910c9d64977131c26e37819

[kelmer44]

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:
8c2c6ade6a PELROCK: Makes sure to always initialize struct/class values. PVS-CODE V730, V501


Commit: 8c2c6ade6ade8e252910c9d64977131c26e37819
    https://github.com/scummvm/scummvm/commit/8c2c6ade6ade8e252910c9d64977131c26e37819
Author: kelmer (kelmer at gmail.com)
Date: 2026-05-22T14:21:00+02:00

Commit Message:
PELROCK: Makes sure to always initialize struct/class values. PVS-CODE V730, V501

Changed paths:
    engines/pelrock/room.cpp
    engines/pelrock/sound.h
    engines/pelrock/types.h


diff --git a/engines/pelrock/room.cpp b/engines/pelrock/room.cpp
index e7c64d4cad8..6e8ee799299 100644
--- a/engines/pelrock/room.cpp
+++ b/engines/pelrock/room.cpp
@@ -1076,7 +1076,7 @@ uint32 RoomManager::loadDescriptions(byte *pair12data, size_t pair12size, Common
 			description.index = pair12data[pos++];
 			description.text = "";
 
-			while (pos < (pair12size) && pair12data[pos] != 0xFD && pos < (pair12size)) {
+			while (pos < (pair12size) && pair12data[pos] != 0xFD) {
 
 				if (pair12data[pos] != 0x00) {
 					description.text.append(1, (char)pair12data[pos]);
diff --git a/engines/pelrock/sound.h b/engines/pelrock/sound.h
index 7107b163831..0d93194bfa4 100644
--- a/engines/pelrock/sound.h
+++ b/engines/pelrock/sound.h
@@ -112,8 +112,8 @@ private:
 
 
 	uint32 _cdTrackStart = 0;
-	uint32 _cdTrackDuration;
-	uint32 _cdPlayStartTime; // time at the moment of calling play()
+	uint32 _cdTrackDuration = 0;
+	uint32 _cdPlayStartTime = 0; // time at the moment of calling play()
 
 };
 
diff --git a/engines/pelrock/types.h b/engines/pelrock/types.h
index 34b56a55dda..b2832a3e06d 100644
--- a/engines/pelrock/types.h
+++ b/engines/pelrock/types.h
@@ -502,7 +502,7 @@ struct RoomPasserBys {
  * Structure to hold a parsed choice option
  */
 struct ChoiceOption {
-	byte room;
+	byte room = -1;
 	int choiceIndex;
 	Common::String text;
 	uint32 dataOffset;