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

[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:
b6630fa4c7 M4: BURGER: Fix some PVS Studio V730, some renaming in room 503


Commit: b6630fa4c7f8b75368d7300fc336c637b3c4f93c
    https://github.com/scummvm/scummvm/commit/b6630fa4c7f8b75368d7300fc336c637b3c4f93c
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-04T09:31:53+01:00

Commit Message:
M4: BURGER: Fix some PVS Studio V730, some renaming in room 503

Changed paths:
    engines/m4/burger/rooms/section5/room503.cpp
    engines/m4/burger/rooms/section5/room503.h
    engines/m4/burger/rooms/section5/room506.cpp
    engines/m4/burger/rooms/section5/room507.cpp


diff --git a/engines/m4/burger/rooms/section5/room503.cpp b/engines/m4/burger/rooms/section5/room503.cpp
index 068b385456a..4ff1666e7ac 100644
--- a/engines/m4/burger/rooms/section5/room503.cpp
+++ b/engines/m4/burger/rooms/section5/room503.cpp
@@ -277,14 +277,17 @@ Room503::Room503() : Section5Room() {
 	_state4 = 0;
 	_state5 = 0;
 	_state6 = 0;
+
+	for (int i = 0; i < 5; ++i)
+		_array1[i] = _array2[i] = -1;
 }
 
 void Room503::init() {
 	Section5Room::init();
 	_flag5 = false;
 
-	for (_val2 = 0; _val2 < 5; ++_val2)
-		_array1[_val2] = _array2[_val2] = -1;
+	for (_ctr = 0; _ctr < 5; ++_ctr)
+		_array1[_ctr] = _array2[_ctr] = -1;
 
 	switch (_G(game).previous_room) {
 	case KERNEL_RESTORING_GAME:
@@ -370,8 +373,8 @@ void Room503::daemon() {
 		if (_flag5) {
 			kernel_trigger_dispatch_now(1);
 		} else {
-			for (_val2 = 0; _val2 < 5; ++_val2) {
-				_array1[_val2] = _array2[_val2];
+			for (_ctr = 0; _ctr < 5; ++_ctr) {
+				_array1[_ctr] = _array2[_ctr];
 			}
 
 			kernel_trigger_dispatch_now(2);
@@ -381,10 +384,10 @@ void Room503::daemon() {
 	case 2:
 		_flag5 = true;
 
-		for (_val2 = 0; _val2 < 5; ++_val2) {
-			if (_array1[_val2] != -1) {
-				kernel_trigger_dispatch_now(_array1[_val2]);
-				_array1[_val2] = -1;
+		for (_ctr = 0; _ctr < 5; ++_ctr) {
+			if (_array1[_ctr] != -1) {
+				kernel_trigger_dispatch_now(_array1[_ctr]);
+				_array1[_ctr] = -1;
 			}
 		}
 
diff --git a/engines/m4/burger/rooms/section5/room503.h b/engines/m4/burger/rooms/section5/room503.h
index eea0204295a..a6673b5160b 100644
--- a/engines/m4/burger/rooms/section5/room503.h
+++ b/engines/m4/burger/rooms/section5/room503.h
@@ -63,7 +63,7 @@ private:
 	static int32 _state6;
 	int16 _array1[5];
 	int16 _array2[5];
-	int _val2 = 0;
+	int _ctr = 0;
 	int _val4 = 0;
 	int _val5 = 0;
 	int _val6 = 0;
diff --git a/engines/m4/burger/rooms/section5/room506.cpp b/engines/m4/burger/rooms/section5/room506.cpp
index 024b2560533..0f126d8c735 100644
--- a/engines/m4/burger/rooms/section5/room506.cpp
+++ b/engines/m4/burger/rooms/section5/room506.cpp
@@ -118,6 +118,9 @@ int32 Room506::_state2;
 Room506::Room506() : Section5Room() {
 	_state1 = 0;
 	_state2 = 0;
+
+	for (int i = 0; i < 5; ++i)
+		_triggers[i] = -1;
 }
 
 void Room506::init() {
diff --git a/engines/m4/burger/rooms/section5/room507.cpp b/engines/m4/burger/rooms/section5/room507.cpp
index d8f356aa274..c61e293d7f2 100644
--- a/engines/m4/burger/rooms/section5/room507.cpp
+++ b/engines/m4/burger/rooms/section5/room507.cpp
@@ -225,6 +225,9 @@ Room507::Room507() : Section5Room() {
 	_state3 = 0;
 	_state4 = 0;
 	_state5 = 0;
+
+	for (int i = 0; i < 5; ++i)
+		_triggers[i] = -1;
 }
 
 void Room507::init() {