[Scummvm-git-logs] scummvm master -> 1350eca4a1841711a9d1dd407b6d02031d78ff4a

[Strangerke]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
38f04d9384 M4: BURGER: Fix unreferenced bug in room 602 - Typo in hotspot name
1350eca4a1 M4: BURGER: Review and cleanup of section 6


Commit: 38f04d938489537837215c0ee713a7ea96d84f7d
    https://github.com/scummvm/scummvm/commit/38f04d938489537837215c0ee713a7ea96d84f7d
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-27T09:57:24+01:00

Commit Message:
M4: BURGER: Fix unreferenced bug in room 602 - Typo in hotspot name

Changed paths:
    engines/m4/burger/rooms/section6/room602.cpp


diff --git a/engines/m4/burger/rooms/section6/room602.cpp b/engines/m4/burger/rooms/section6/room602.cpp
index 052964da5f0..ec0cc27a46f 100644
--- a/engines/m4/burger/rooms/section6/room602.cpp
+++ b/engines/m4/burger/rooms/section6/room602.cpp
@@ -474,7 +474,7 @@ void Room602::daemon() {
 			hotspot_set_active("PAW", true);
 			hotspot_set_active("MOTOR", true);
 			hotspot_set_active("MOTOR ", false);
-			hotspot_set_active("FOOR  ", true);
+			hotspot_set_active("FLOOR  ", true);
 			break;
 
 		case 56:


Commit: 1350eca4a1841711a9d1dd407b6d02031d78ff4a
    https://github.com/scummvm/scummvm/commit/1350eca4a1841711a9d1dd407b6d02031d78ff4a
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-01-27T10:34:25+01:00

Commit Message:
M4: BURGER: Review and cleanup of section 6

Changed paths:
    engines/m4/burger/rooms/section6/room604.cpp
    engines/m4/burger/rooms/section6/room610.cpp
    engines/m4/burger/rooms/section6/section6.cpp
    engines/m4/burger/rooms/section6/section6_room.cpp


diff --git a/engines/m4/burger/rooms/section6/room604.cpp b/engines/m4/burger/rooms/section6/room604.cpp
index 844af120a32..8a8053693bd 100644
--- a/engines/m4/burger/rooms/section6/room604.cpp
+++ b/engines/m4/burger/rooms/section6/room604.cpp
@@ -724,7 +724,7 @@ void Room604::pre_parser() {
 
 void Room604::parser() {
 	_G(kernel).trigger_mode = KT_DAEMON;
-	bool rayGun = player_said("RAY GUN");
+	const bool rayGun = player_said("RAY GUN");
 
 	if (_G(walker).wilbur_said(SAID)) {
 		// Already handled
diff --git a/engines/m4/burger/rooms/section6/room610.cpp b/engines/m4/burger/rooms/section6/room610.cpp
index ae12ac07a64..25311e595a6 100644
--- a/engines/m4/burger/rooms/section6/room610.cpp
+++ b/engines/m4/burger/rooms/section6/room610.cpp
@@ -71,7 +71,7 @@ void Room610::preload() {
 
 void Room610::init() {
 	_G(flags)[kSecondTestPassed] = 1;
-	_G(kernel).suppress_fadeup = 1;
+	_G(kernel).suppress_fadeup = true;
 	kernel_trigger_dispatch_now(1);
 }
 
diff --git a/engines/m4/burger/rooms/section6/section6.cpp b/engines/m4/burger/rooms/section6/section6.cpp
index e482acf450f..1e5932e4888 100644
--- a/engines/m4/burger/rooms/section6/section6.cpp
+++ b/engines/m4/burger/rooms/section6/section6.cpp
@@ -27,10 +27,10 @@ namespace Burger {
 namespace Rooms {
 
 static const seriesPlayBreak PLAY1[] = {
-	{  0, 10, nullptr,   1,   0, -1, 2048, 0, 0, 0 },
-	{ 11, 30, "600_011", 2, 255, -1,    0, 0, 0, 0 },
-	{ 31, 33, "600_001", 2, 255, -1,    0, 0, 0, 0 },
-	{ 34, -1, "600_002", 1, 255, -1,    0, 0, 0, 0 },
+	{  0, 10, nullptr,   1,   0, -1, 2048, 0, nullptr, 0 },
+	{ 11, 30, "600_011", 2, 255, -1,    0, 0, nullptr, 0 },
+	{ 31, 33, "600_001", 2, 255, -1,    0, 0, nullptr, 0 },
+	{ 34, -1, "600_002", 1, 255, -1,    0, 0, nullptr, 0 },
 	PLAY_BREAK_END
 };
 
@@ -367,7 +367,7 @@ void Section6::daemon() {
 
 void Section6::parser() {
 	_G(kernel).trigger_mode = KT_DAEMON;
-	bool kibble = player_said("KIBBLE");
+	const bool kibble = player_said("KIBBLE");
 
 	if (player_said("RAY GUN", "BLOCK OF ICE")) {
 		_G(flags)[V247] = 1;
diff --git a/engines/m4/burger/rooms/section6/section6_room.cpp b/engines/m4/burger/rooms/section6/section6_room.cpp
index 352269fcd61..153fd837f1a 100644
--- a/engines/m4/burger/rooms/section6/section6_room.cpp
+++ b/engines/m4/burger/rooms/section6/section6_room.cpp
@@ -51,8 +51,6 @@ HotSpotRec *Section6Room::custom_hotspot_which(int32 x, int32 y) {
 		return nullptr;
 
 	int x1, x2, x3, y1, y2, y3;
-	int total1, total2, total3;
-	int diff;
 
 	if (_G(flags)[V266]) {
 		x1 = 189;
@@ -62,10 +60,10 @@ HotSpotRec *Section6Room::custom_hotspot_which(int32 x, int32 y) {
 		x3 = 439;
 		y3 = 232;
 	} else {
-		int index = _sectionMachine1->myAnim8->myRegs[IDX_CELS_INDEX];
+		const int index = _sectionMachine1->myAnim8->myRegs[IDX_CELS_INDEX];
 		const GerbilPoint *points = _gerbilTable + index;
 
-		diff = points[3]._x - points[0]._x;
+		int diff = points[3]._x - points[0]._x;
 		x1 = points[0]._x + (index % 3) * diff / 3;
 
 		diff = points[4]._x - points[1]._x;
@@ -84,9 +82,9 @@ HotSpotRec *Section6Room::custom_hotspot_which(int32 x, int32 y) {
 		y3 = points[2]._y + (index % 3) * diff / 3;
 	}
 
-	total1 = (x - x1) * (x - x1) + (y - y1) * (y - y1);
-	total2 = (x - x2) * (x - x2) + (y - y2) * (y - y2);
-	total3 = (x - x3) * (x - x3) + (y - y3) * (y - y3);
+	const int total1 = (x - x1) * (x - x1) + (y - y1) * (y - y1);
+	const int total2 = (x - x2) * (x - x2) + (y - y2) * (y - y2);
+	const int total3 = (x - x3) * (x - x3) + (y - y3) * (y - y3);
 
 	return (total1 < 1600) || (total2 < 1600) < (total3 < 1600) ?
 		&_gerbilHotspot : nullptr;