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

[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:
b717249904 M4: BURGER: Some janitorial work in room 139 and 143


Commit: b7172499047dd16107cb75cad8b2ddce705601fd
    https://github.com/scummvm/scummvm/commit/b7172499047dd16107cb75cad8b2ddce705601fd
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-26T10:49:15+01:00

Commit Message:
M4: BURGER: Some janitorial work in room 139 and 143

Changed paths:
    engines/m4/burger/rooms/section1/room139_144.cpp
    engines/m4/burger/rooms/section1/room143.cpp


diff --git a/engines/m4/burger/rooms/section1/room139_144.cpp b/engines/m4/burger/rooms/section1/room139_144.cpp
index 246ab3f521e..c01da20a7b8 100644
--- a/engines/m4/burger/rooms/section1/room139_144.cpp
+++ b/engines/m4/burger/rooms/section1/room139_144.cpp
@@ -57,21 +57,21 @@ static const char *SAID2[][4] = {
 };
 
 static const seriesPlayBreak PLAY1[] = {
-	{ 0, 32, 0, 1, 255, -1, 0, 0, 0, 0 },
-	{ 33, 39, "139_002", 2, 255, -1, 0, 0, 0, 0 },
-	{ 40, 43, 0, 1, 255, 8, 0, 0, 0, 0 },
-	{ 44, 52, "139_003", 2, 255, -1, 0, 0, 0, 0 },
-	{ 52, 52, 0, 1, 255, -1, 0, 0, 0, 0 },
-	{ 52, 52, 0, 1, 255, -1, 0, 0, 0, 0 },
-	{ 52, 52, 0, 1, 255, -1, 0, 0, 0, 0 },
-	{ 52, 52, 0, 1, 255, -1, 0, 0, 0, 0 },
-	{ 52, 52, 0, 1, 255, -1, 0, 0, 0, 0 },
-	{ 52, 52, 0, 1, 255, -1, 0, 0, 0, 0 },
-	{ 52, 52, 0, 1, 255, -1, 0, 0, 0, 0 },
-	{ 52, 52, 0, 1, 255, -1, 0, 0, 0, 0 },
-	{ 52, 52, 0, 1, 255, -1, 0, 0, 0, 0 },
-	{ 52, 52, 0, 1, 255, -1, 0, 0, 0, 0 },
-	{ 52, 52, 0, 1, 255, -1, 0, 0, 0, 0 },
+	{ 0, 32, nullptr, 1, 255, -1, 0, 0, nullptr, 0 },
+	{ 33, 39, "139_002", 2, 255, -1, 0, 0, nullptr, 0 },
+	{40, 43, nullptr, 1, 255, 8, 0, 0, nullptr, 0},
+	{44, 52, "139_003", 2, 255, -1, 0, 0, nullptr, 0},
+	{52, 52, nullptr, 1, 255, -1, 0, 0, nullptr, 0},
+	{52, 52, nullptr, 1, 255, -1, 0, 0, nullptr, 0},
+	{52, 52, nullptr, 1, 255, -1, 0, 0, nullptr, 0},
+	{52, 52, nullptr, 1, 255, -1, 0, 0, nullptr, 0},
+	{52, 52, nullptr, 1, 255, -1, 0, 0, nullptr, 0},
+	{52, 52, nullptr, 1, 255, -1, 0, 0, nullptr, 0},
+	{52, 52, nullptr, 1, 255, -1, 0, 0, nullptr, 0},
+	{52, 52, nullptr, 1, 255, -1, 0, 0, nullptr, 0},
+	{52, 52, nullptr, 1, 255, -1, 0, 0, nullptr, 0},
+	{52, 52, nullptr, 1, 255, -1, 0, 0, nullptr, 0},
+	{52, 52, nullptr, 1, 255, -1, 0, 0, nullptr, 0},
 	PLAY_BREAK_END
 };
 
@@ -95,9 +95,9 @@ static const seriesPlayBreak PLAY2[] = {
 };
 
 static const seriesStreamBreak SERIES1[] = {
-	{ 6, 0, 2, 255, 2, 0, 0, 0 },
-	{ 10, "100_022", 2, 255, -1, 0, 0, 0 },
-	{ -1, 0, 0, 0, -1, 0, 0, 0 },
+	{ 6, nullptr, 2, 255, 2, 0, nullptr, 0 },
+	{ 10, "100_022", 2, 255, -1, 0, nullptr, 0 },
+	{ -1, nullptr, 0, 0, -1, 0, nullptr, 0 },
 	STREAM_BREAK_END
 };
 
@@ -159,7 +159,6 @@ void Room139_144::init() {
 }
 
 void Room139_144::daemon() {
-	int frame;
 
 	switch (_G(kernel).trigger) {
 	case 2:
@@ -333,7 +332,7 @@ void Room139_144::daemon() {
 
 		case 5:
 			if (_burlShould == 5) {
-				frame = imath_ranged_rand(0, 2);
+				const int frame = imath_ranged_rand(0, 2);
 				series_play("144bu09", 0x300, 0, kCHANGE_BURL_ANIMATION, 4, 0, 100, 0, 0, frame, frame);
 				series_play("144bu09s", 0x301, 0, -1, 4, 0, 100, 0, 0, frame, frame);
 
@@ -402,7 +401,7 @@ void Room139_144::pre_parser() {
 }
 
 void Room139_144::parser() {
-	bool lookFlag = player_said_any("look", "look at");
+	const bool lookFlag = player_said_any("look", "look at");
 	_G(kernel).trigger_mode = KT_DAEMON;
 
 	if (player_said("talk to")) {
@@ -468,7 +467,7 @@ void Room139_144::randomDigi() {
 
 void Room139_144::conv31() {
 	_G(kernel).trigger_mode = KT_PARSE;
-	int who = conv_whos_talking();
+	const int who = conv_whos_talking();
 
 	if (_G(kernel).trigger == 1) {
 		if (who <= 0) {
diff --git a/engines/m4/burger/rooms/section1/room143.cpp b/engines/m4/burger/rooms/section1/room143.cpp
index b2c6bf61278..69c728dc13b 100644
--- a/engines/m4/burger/rooms/section1/room143.cpp
+++ b/engines/m4/burger/rooms/section1/room143.cpp
@@ -1161,8 +1161,8 @@ void Room143::pre_parser() {
 }
 
 void Room143::parser() {
-	bool lookFlag = player_said_any("look", "look at");
-	bool money = player_said("money ");
+	const bool lookFlag = player_said_any("look", "look at");
+	const bool money = player_said("money ");
 	_G(kernel).trigger_mode = KT_DAEMON;
 
 	if (player_said("conv35")) {
@@ -1310,9 +1310,9 @@ void Room143::parser() {
 void Room143::conv35() {
 	_G(kernel).trigger_mode = KT_PARSE;
 	const char *sound = conv_sound_to_play();
-	int who = conv_whos_talking();
-	int node = conv_current_node();
-	int entry = conv_current_entry();
+	const int who = conv_whos_talking();
+	const int node = conv_current_node();
+	const int entry = conv_current_entry();
 
 	switch (_G(kernel).trigger) {
 	case 9:
@@ -1432,7 +1432,7 @@ void Room143::conv35() {
 void Room143::conv30() {
 	_G(kernel).trigger_mode = KT_PARSE;
 	const char *sound = conv_sound_to_play();
-	int who = conv_whos_talking();
+	const int who = conv_whos_talking();
 
 	if (_G(kernel).trigger == 9) {
 		if (who <= 0) {