[Scummvm-git-logs] scummvm master -> 180ada385e08c7173e8678b15e5be8f5b261efd0

Strangerke noreply at scummvm.org
Mon Feb 16 11:33:09 UTC 2026 

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:
53576a7b65 M4: BURGER: move imath and conv includes from room.h to the rooms really using them
180ada385e M4: BURGER: Remove unused room variable in room 104


Commit: 53576a7b65b968c0e65cb95b6cccc71bbcea7630
    https://github.com/scummvm/scummvm/commit/53576a7b65b968c0e65cb95b6cccc71bbcea7630
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-16T10:16:28+01:00

Commit Message:
M4: BURGER: move imath and conv includes from room.h to the rooms really using them

Changed paths:
    engines/m4/burger/rooms/room.cpp
    engines/m4/burger/rooms/room.h
    engines/m4/burger/rooms/section.cpp
    engines/m4/burger/rooms/section1/room102.cpp
    engines/m4/burger/rooms/section1/room103.cpp
    engines/m4/burger/rooms/section1/room104.cpp
    engines/m4/burger/rooms/section1/room105.cpp
    engines/m4/burger/rooms/section1/room106.cpp
    engines/m4/burger/rooms/section1/room133_136.cpp
    engines/m4/burger/rooms/section1/room134_135.cpp
    engines/m4/burger/rooms/section1/room137.cpp
    engines/m4/burger/rooms/section1/room138.cpp
    engines/m4/burger/rooms/section1/room139_144.cpp
    engines/m4/burger/rooms/section1/room140_141.cpp
    engines/m4/burger/rooms/section1/room142.cpp
    engines/m4/burger/rooms/section1/room143.cpp
    engines/m4/burger/rooms/section1/room145.cpp
    engines/m4/burger/rooms/section1/room171.cpp
    engines/m4/burger/rooms/section1/room172.cpp
    engines/m4/burger/rooms/section2/room207.cpp
    engines/m4/burger/rooms/section3/mine.cpp
    engines/m4/burger/rooms/section3/room302.cpp
    engines/m4/burger/rooms/section3/room305.cpp
    engines/m4/burger/rooms/section3/room310.cpp
    engines/m4/burger/rooms/section3/section3.cpp
    engines/m4/burger/rooms/section4/room402.cpp
    engines/m4/burger/rooms/section4/room405.cpp
    engines/m4/burger/rooms/section4/room406.cpp
    engines/m4/burger/rooms/section4/room407.cpp
    engines/m4/burger/rooms/section4/section4.cpp
    engines/m4/burger/rooms/section5/room502.cpp
    engines/m4/burger/rooms/section5/room503.cpp
    engines/m4/burger/rooms/section5/room504.cpp
    engines/m4/burger/rooms/section5/room505.cpp
    engines/m4/burger/rooms/section5/room506.cpp
    engines/m4/burger/rooms/section5/room507.cpp
    engines/m4/burger/rooms/section5/room508.cpp
    engines/m4/burger/rooms/section5/room509.cpp
    engines/m4/burger/rooms/section5/room510.cpp
    engines/m4/burger/rooms/section5/room511.cpp
    engines/m4/burger/rooms/section5/room512.cpp
    engines/m4/burger/rooms/section5/section5.cpp
    engines/m4/burger/rooms/section6/room602.cpp
    engines/m4/burger/rooms/section6/room603.cpp
    engines/m4/burger/rooms/section6/room604.cpp
    engines/m4/burger/rooms/section6/room605.cpp
    engines/m4/burger/rooms/section6/room606.cpp
    engines/m4/burger/rooms/section6/room609.cpp
    engines/m4/burger/rooms/section7/room702.cpp
    engines/m4/burger/rooms/section7/room706.cpp
    engines/m4/burger/rooms/section8/room801.cpp
    engines/m4/burger/rooms/section8/room802.cpp


diff --git a/engines/m4/burger/rooms/room.cpp b/engines/m4/burger/rooms/room.cpp
index 8163c45c5f0..5183a9c9b32 100644
--- a/engines/m4/burger/rooms/room.cpp
+++ b/engines/m4/burger/rooms/room.cpp
@@ -21,6 +21,7 @@
 
 #include "m4/burger/rooms/room.h"
 #include "m4/burger/vars.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
@@ -46,9 +47,9 @@ HotSpotRec *Room::custom_hotspot_which(int32 x, int32 y) {
 		return nullptr;
 
 	player_update_info();
-	int y2 = _G(player_info).y - (_G(player_info).scale * 75 / 100);
-	int y1 = _G(player_info).y - (_G(player_info).scale * 150 / 100);
-	int xSize = _G(player_info).scale * 22 / 100;
+	const int y2 = _G(player_info).y - (_G(player_info).scale * 75 / 100);
+	const int y1 = _G(player_info).y - (_G(player_info).scale * 150 / 100);
+	const int xSize = _G(player_info).scale * 22 / 100;
 
 	if (y > y2 || y <= y1 || imath_abs(x - _G(player_info).x) >= xSize)
 		return nullptr;
diff --git a/engines/m4/burger/rooms/room.h b/engines/m4/burger/rooms/room.h
index 7288f0dc921..407751338f6 100644
--- a/engines/m4/burger/rooms/room.h
+++ b/engines/m4/burger/rooms/room.h
@@ -25,9 +25,7 @@
 #include "m4/core/rooms.h"
 #include "m4/burger/core/play_break.h"
 #include "m4/burger/core/stream_break.h"
-#include "m4/burger/core/conv.h"
 #include "m4/adv_r/conv_io.h"
-#include "m4/core/imath.h"
 #include "m4/graphics/gr_series.h"
 #include "m4/adv_r/adv_hotspot.h"
 
diff --git a/engines/m4/burger/rooms/section.cpp b/engines/m4/burger/rooms/section.cpp
index c6962dba022..3063955dfa5 100644
--- a/engines/m4/burger/rooms/section.cpp
+++ b/engines/m4/burger/rooms/section.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "m4/burger/rooms/section.h"
-#include "m4/gui/gui_vmng.h"
 #include "m4/burger/vars.h"
 #include "m4/m4.h"
 #include "m4/adv_r/adv_control.h"
@@ -30,7 +29,7 @@ namespace Burger {
 namespace Rooms {
 
 void Section::global_room_init() {
-	int roomId = _G(game).room_id;
+	const int roomId = _G(game).room_id;
 
 	if (roomId <= 800)
 		_GINT().show();
@@ -134,7 +133,7 @@ void Section::init_series_players() {
 }
 
 void Section::tick() {
-	int oldTrigger = _G(kernel).trigger;
+	const int oldTrigger = _G(kernel).trigger;
 	_G(kernel).trigger = kCALLED_EACH_LOOP;
 	g_engine->game_daemon_code();
 	_G(kernel).trigger = oldTrigger;
diff --git a/engines/m4/burger/rooms/section1/room102.cpp b/engines/m4/burger/rooms/section1/room102.cpp
index ee5b940f8e0..5328512d004 100644
--- a/engines/m4/burger/rooms/section1/room102.cpp
+++ b/engines/m4/burger/rooms/section1/room102.cpp
@@ -21,6 +21,7 @@
 
 #include "m4/burger/rooms/section1/room102.h"
 #include "m4/burger/rooms/section1/section1.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/core/imath.h"
diff --git a/engines/m4/burger/rooms/section1/room103.cpp b/engines/m4/burger/rooms/section1/room103.cpp
index 8fb90b25db7..753f16ce917 100644
--- a/engines/m4/burger/rooms/section1/room103.cpp
+++ b/engines/m4/burger/rooms/section1/room103.cpp
@@ -24,6 +24,7 @@
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/graphics/gr_series.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room104.cpp b/engines/m4/burger/rooms/section1/room104.cpp
index 9cfb9c13b2c..ff274b4073b 100644
--- a/engines/m4/burger/rooms/section1/room104.cpp
+++ b/engines/m4/burger/rooms/section1/room104.cpp
@@ -21,6 +21,7 @@
 
 #include "m4/burger/rooms/section1/room104.h"
 #include "m4/burger/rooms/section1/section1.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/core/imath.h"
diff --git a/engines/m4/burger/rooms/section1/room105.cpp b/engines/m4/burger/rooms/section1/room105.cpp
index cb26f51d75a..0530f2677df 100644
--- a/engines/m4/burger/rooms/section1/room105.cpp
+++ b/engines/m4/burger/rooms/section1/room105.cpp
@@ -21,9 +21,11 @@
 
 #include "m4/burger/rooms/section1/room105.h"
 #include "m4/burger/rooms/section1/section1.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/graphics/gr_series.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room106.cpp b/engines/m4/burger/rooms/section1/room106.cpp
index 5563e32ba32..004194d6329 100644
--- a/engines/m4/burger/rooms/section1/room106.cpp
+++ b/engines/m4/burger/rooms/section1/room106.cpp
@@ -24,6 +24,7 @@
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/graphics/gr_series.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room133_136.cpp b/engines/m4/burger/rooms/section1/room133_136.cpp
index b9ad4268330..8574f5ead35 100644
--- a/engines/m4/burger/rooms/section1/room133_136.cpp
+++ b/engines/m4/burger/rooms/section1/room133_136.cpp
@@ -24,6 +24,7 @@
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/graphics/gr_series.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room134_135.cpp b/engines/m4/burger/rooms/section1/room134_135.cpp
index 7eadf2afe27..d2a9a4992c6 100644
--- a/engines/m4/burger/rooms/section1/room134_135.cpp
+++ b/engines/m4/burger/rooms/section1/room134_135.cpp
@@ -21,9 +21,11 @@
 
 #include "m4/burger/rooms/section1/room134_135.h"
 #include "m4/burger/rooms/section1/section1.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room137.cpp b/engines/m4/burger/rooms/section1/room137.cpp
index 37c8cb1e7a6..b2b9aea9eac 100644
--- a/engines/m4/burger/rooms/section1/room137.cpp
+++ b/engines/m4/burger/rooms/section1/room137.cpp
@@ -21,9 +21,11 @@
 
 #include "m4/burger/rooms/section1/room137.h"
 #include "m4/burger/rooms/section1/section1.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/graphics/gr_series.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room138.cpp b/engines/m4/burger/rooms/section1/room138.cpp
index 5886d094e05..f3f4fc8ec1c 100644
--- a/engines/m4/burger/rooms/section1/room138.cpp
+++ b/engines/m4/burger/rooms/section1/room138.cpp
@@ -24,6 +24,7 @@
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/graphics/gr_series.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room139_144.cpp b/engines/m4/burger/rooms/section1/room139_144.cpp
index 3f494575ef1..6dff29b66cc 100644
--- a/engines/m4/burger/rooms/section1/room139_144.cpp
+++ b/engines/m4/burger/rooms/section1/room139_144.cpp
@@ -21,9 +21,11 @@
 
 #include "m4/burger/rooms/section1/room139_144.h"
 #include "m4/burger/rooms/section1/section1.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/graphics/gr_series.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room140_141.cpp b/engines/m4/burger/rooms/section1/room140_141.cpp
index 1d55d29abf0..145279d7531 100644
--- a/engines/m4/burger/rooms/section1/room140_141.cpp
+++ b/engines/m4/burger/rooms/section1/room140_141.cpp
@@ -21,9 +21,11 @@
 
 #include "m4/burger/rooms/section1/room140_141.h"
 #include "m4/burger/rooms/section1/section1.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/graphics/gr_series.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room142.cpp b/engines/m4/burger/rooms/section1/room142.cpp
index edf555b088a..724ea74182e 100644
--- a/engines/m4/burger/rooms/section1/room142.cpp
+++ b/engines/m4/burger/rooms/section1/room142.cpp
@@ -25,6 +25,7 @@
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/graphics/gr_series.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room143.cpp b/engines/m4/burger/rooms/section1/room143.cpp
index 930ce3a9fb8..0d1b114f68a 100644
--- a/engines/m4/burger/rooms/section1/room143.cpp
+++ b/engines/m4/burger/rooms/section1/room143.cpp
@@ -22,8 +22,10 @@
 #include "m4/burger/rooms/section1/room143.h"
 #include "m4/burger/rooms/section1/section1.h"
 #include "m4/burger/burger.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room145.cpp b/engines/m4/burger/rooms/section1/room145.cpp
index e5f36c23ae1..f1e84b7a590 100644
--- a/engines/m4/burger/rooms/section1/room145.cpp
+++ b/engines/m4/burger/rooms/section1/room145.cpp
@@ -22,8 +22,10 @@
 #include "m4/burger/rooms/section1/room145.h"
 #include "m4/burger/rooms/section1/section1.h"
 #include "m4/burger/burger.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room171.cpp b/engines/m4/burger/rooms/section1/room171.cpp
index bd9ea33fa22..12ab653b4c1 100644
--- a/engines/m4/burger/rooms/section1/room171.cpp
+++ b/engines/m4/burger/rooms/section1/room171.cpp
@@ -21,9 +21,11 @@
 
 #include "m4/burger/rooms/section1/room171.h"
 #include "m4/burger/rooms/section1/section1.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/graphics/gr_series.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room172.cpp b/engines/m4/burger/rooms/section1/room172.cpp
index a11a6b9fcf4..a6967005c56 100644
--- a/engines/m4/burger/rooms/section1/room172.cpp
+++ b/engines/m4/burger/rooms/section1/room172.cpp
@@ -21,9 +21,11 @@
 
 #include "m4/burger/rooms/section1/room172.h"
 #include "m4/burger/rooms/section1/section1.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/graphics/gr_series.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section2/room207.cpp b/engines/m4/burger/rooms/section2/room207.cpp
index 13e60d46387..19ec67e99d6 100644
--- a/engines/m4/burger/rooms/section2/room207.cpp
+++ b/engines/m4/burger/rooms/section2/room207.cpp
@@ -21,8 +21,10 @@
 
 #include "m4/burger/rooms/section2/room207.h"
 #include "m4/burger/burger.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section3/mine.cpp b/engines/m4/burger/rooms/section3/mine.cpp
index faf620ee0f8..1e016439826 100644
--- a/engines/m4/burger/rooms/section3/mine.cpp
+++ b/engines/m4/burger/rooms/section3/mine.cpp
@@ -22,6 +22,7 @@
 #include "m4/burger/rooms/section3/mine.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section3/room302.cpp b/engines/m4/burger/rooms/section3/room302.cpp
index e4d50ce24ae..7ed7617214c 100644
--- a/engines/m4/burger/rooms/section3/room302.cpp
+++ b/engines/m4/burger/rooms/section3/room302.cpp
@@ -22,6 +22,7 @@
 #include "m4/burger/rooms/section3/room302.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section3/room305.cpp b/engines/m4/burger/rooms/section3/room305.cpp
index 62dae22f170..c6e7fe9698d 100644
--- a/engines/m4/burger/rooms/section3/room305.cpp
+++ b/engines/m4/burger/rooms/section3/room305.cpp
@@ -22,6 +22,7 @@
 #include "m4/burger/rooms/section3/room305.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section3/room310.cpp b/engines/m4/burger/rooms/section3/room310.cpp
index 42e23ebe94c..94167224309 100644
--- a/engines/m4/burger/rooms/section3/room310.cpp
+++ b/engines/m4/burger/rooms/section3/room310.cpp
@@ -22,6 +22,7 @@
 #include "m4/burger/rooms/section3/room310.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section3/section3.cpp b/engines/m4/burger/rooms/section3/section3.cpp
index 681effcd1e1..10fa46d643d 100644
--- a/engines/m4/burger/rooms/section3/section3.cpp
+++ b/engines/m4/burger/rooms/section3/section3.cpp
@@ -22,6 +22,7 @@
 #include "m4/burger/rooms/section3/section3.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/room402.cpp b/engines/m4/burger/rooms/section4/room402.cpp
index 67d7eec2fd8..d97d44d237d 100644
--- a/engines/m4/burger/rooms/section4/room402.cpp
+++ b/engines/m4/burger/rooms/section4/room402.cpp
@@ -21,8 +21,10 @@
 
 #include "m4/burger/rooms/section4/room402.h"
 #include "m4/burger/rooms/section4/section4.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/room405.cpp b/engines/m4/burger/rooms/section4/room405.cpp
index 856d3af852b..0bf5b9f9988 100644
--- a/engines/m4/burger/rooms/section4/room405.cpp
+++ b/engines/m4/burger/rooms/section4/room405.cpp
@@ -21,8 +21,10 @@
 
 #include "m4/burger/rooms/section4/room405.h"
 #include "m4/burger/rooms/section4/section4.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/room406.cpp b/engines/m4/burger/rooms/section4/room406.cpp
index 1b5b23f3db1..f66fe3d5286 100644
--- a/engines/m4/burger/rooms/section4/room406.cpp
+++ b/engines/m4/burger/rooms/section4/room406.cpp
@@ -23,6 +23,7 @@
 #include "m4/burger/burger.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/room407.cpp b/engines/m4/burger/rooms/section4/room407.cpp
index 376eedcf29c..d4e659e79f0 100644
--- a/engines/m4/burger/rooms/section4/room407.cpp
+++ b/engines/m4/burger/rooms/section4/room407.cpp
@@ -20,8 +20,10 @@
  */
 
 #include "m4/burger/rooms/section4/room407.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/section4.cpp b/engines/m4/burger/rooms/section4/section4.cpp
index b6d8701fd4d..580a56bccce 100644
--- a/engines/m4/burger/rooms/section4/section4.cpp
+++ b/engines/m4/burger/rooms/section4/section4.cpp
@@ -22,6 +22,7 @@
 #include "m4/burger/rooms/section4/section4.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room502.cpp b/engines/m4/burger/rooms/section5/room502.cpp
index f75a4660631..92324b33deb 100644
--- a/engines/m4/burger/rooms/section5/room502.cpp
+++ b/engines/m4/burger/rooms/section5/room502.cpp
@@ -23,6 +23,7 @@
 #include "m4/burger/rooms/section5/section5.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room503.cpp b/engines/m4/burger/rooms/section5/room503.cpp
index 05e0e6a1077..da72d28138d 100644
--- a/engines/m4/burger/rooms/section5/room503.cpp
+++ b/engines/m4/burger/rooms/section5/room503.cpp
@@ -24,6 +24,7 @@
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/adv_r/adv_hotspot.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room504.cpp b/engines/m4/burger/rooms/section5/room504.cpp
index a252cd14719..10128b492ec 100644
--- a/engines/m4/burger/rooms/section5/room504.cpp
+++ b/engines/m4/burger/rooms/section5/room504.cpp
@@ -23,6 +23,7 @@
 #include "m4/burger/rooms/section5/section5.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room505.cpp b/engines/m4/burger/rooms/section5/room505.cpp
index de770788e46..3373c19d040 100644
--- a/engines/m4/burger/rooms/section5/room505.cpp
+++ b/engines/m4/burger/rooms/section5/room505.cpp
@@ -23,6 +23,7 @@
 #include "m4/burger/rooms/section5/section5.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room506.cpp b/engines/m4/burger/rooms/section5/room506.cpp
index 6c26e1026f2..2fb7723eb6d 100644
--- a/engines/m4/burger/rooms/section5/room506.cpp
+++ b/engines/m4/burger/rooms/section5/room506.cpp
@@ -23,6 +23,7 @@
 #include "m4/burger/rooms/section5/section5.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room507.cpp b/engines/m4/burger/rooms/section5/room507.cpp
index 59a30870f1a..a0c873557e4 100644
--- a/engines/m4/burger/rooms/section5/room507.cpp
+++ b/engines/m4/burger/rooms/section5/room507.cpp
@@ -23,6 +23,7 @@
 #include "m4/burger/rooms/section5/section5.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room508.cpp b/engines/m4/burger/rooms/section5/room508.cpp
index ba84af5dc58..65351d672be 100644
--- a/engines/m4/burger/rooms/section5/room508.cpp
+++ b/engines/m4/burger/rooms/section5/room508.cpp
@@ -23,6 +23,7 @@
 #include "m4/burger/rooms/section5/section5.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room509.cpp b/engines/m4/burger/rooms/section5/room509.cpp
index 308979cac82..71d618c8db4 100644
--- a/engines/m4/burger/rooms/section5/room509.cpp
+++ b/engines/m4/burger/rooms/section5/room509.cpp
@@ -23,6 +23,7 @@
 #include "m4/burger/rooms/section5/section5.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room510.cpp b/engines/m4/burger/rooms/section5/room510.cpp
index dba20460251..8378bed2b59 100644
--- a/engines/m4/burger/rooms/section5/room510.cpp
+++ b/engines/m4/burger/rooms/section5/room510.cpp
@@ -23,6 +23,7 @@
 #include "m4/burger/rooms/section5/section5.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room511.cpp b/engines/m4/burger/rooms/section5/room511.cpp
index 5e4e0352d3b..a666f39980a 100644
--- a/engines/m4/burger/rooms/section5/room511.cpp
+++ b/engines/m4/burger/rooms/section5/room511.cpp
@@ -22,6 +22,7 @@
 #include "m4/burger/rooms/section5/room511.h"
 #include "m4/burger/rooms/section5/section5.h"
 #include "m4/burger/vars.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room512.cpp b/engines/m4/burger/rooms/section5/room512.cpp
index 698c4c06804..62f2cb47266 100644
--- a/engines/m4/burger/rooms/section5/room512.cpp
+++ b/engines/m4/burger/rooms/section5/room512.cpp
@@ -22,6 +22,7 @@
 #include "m4/burger/rooms/section5/room512.h"
 #include "m4/burger/rooms/section5/section5.h"
 #include "m4/burger/vars.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/section5.cpp b/engines/m4/burger/rooms/section5/section5.cpp
index 31a6c067532..c2b074a3f95 100644
--- a/engines/m4/burger/rooms/section5/section5.cpp
+++ b/engines/m4/burger/rooms/section5/section5.cpp
@@ -25,6 +25,7 @@
 #include "m4/burger/burger.h"
 #include "m4/adv_r/adv_control.h"
 #include "m4/gui/gui_sys.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section6/room602.cpp b/engines/m4/burger/rooms/section6/room602.cpp
index 59cf33c2466..bee55884319 100644
--- a/engines/m4/burger/rooms/section6/room602.cpp
+++ b/engines/m4/burger/rooms/section6/room602.cpp
@@ -23,6 +23,7 @@
 #include "m4/burger/rooms/section6/section6.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section6/room603.cpp b/engines/m4/burger/rooms/section6/room603.cpp
index 1ab2bc48aab..29343da1cdb 100644
--- a/engines/m4/burger/rooms/section6/room603.cpp
+++ b/engines/m4/burger/rooms/section6/room603.cpp
@@ -23,6 +23,7 @@
 #include "m4/burger/rooms/section6/section6.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section6/room604.cpp b/engines/m4/burger/rooms/section6/room604.cpp
index 99572805cbf..9d683a3a674 100644
--- a/engines/m4/burger/rooms/section6/room604.cpp
+++ b/engines/m4/burger/rooms/section6/room604.cpp
@@ -23,6 +23,7 @@
 #include "m4/burger/rooms/section6/section6.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section6/room605.cpp b/engines/m4/burger/rooms/section6/room605.cpp
index a3b287ff2db..8f880e82db5 100644
--- a/engines/m4/burger/rooms/section6/room605.cpp
+++ b/engines/m4/burger/rooms/section6/room605.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "m4/burger/rooms/section6/room605.h"
-#include "m4/burger/rooms/section6/section6.h"
 #include "m4/burger/vars.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section6/room606.cpp b/engines/m4/burger/rooms/section6/room606.cpp
index 231bb2b36a7..4d51396a5e9 100644
--- a/engines/m4/burger/rooms/section6/room606.cpp
+++ b/engines/m4/burger/rooms/section6/room606.cpp
@@ -22,6 +22,7 @@
 #include "m4/burger/rooms/section6/room606.h"
 #include "m4/burger/rooms/section6/section6.h"
 #include "m4/burger/vars.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section6/room609.cpp b/engines/m4/burger/rooms/section6/room609.cpp
index e62f7f1670b..3b1bd114ef7 100644
--- a/engines/m4/burger/rooms/section6/room609.cpp
+++ b/engines/m4/burger/rooms/section6/room609.cpp
@@ -22,6 +22,7 @@
 #include "m4/burger/rooms/section6/room609.h"
 #include "m4/burger/rooms/section6/section6.h"
 #include "m4/burger/vars.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section7/room702.cpp b/engines/m4/burger/rooms/section7/room702.cpp
index ed9b347f95d..aa85a8b145a 100644
--- a/engines/m4/burger/rooms/section7/room702.cpp
+++ b/engines/m4/burger/rooms/section7/room702.cpp
@@ -21,8 +21,10 @@
 
 #include "m4/burger/rooms/section7/room702.h"
 #include "m4/burger/rooms/section7/section7.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section7/room706.cpp b/engines/m4/burger/rooms/section7/room706.cpp
index ba48fccaffb..926571978fa 100644
--- a/engines/m4/burger/rooms/section7/room706.cpp
+++ b/engines/m4/burger/rooms/section7/room706.cpp
@@ -21,8 +21,10 @@
 
 #include "m4/burger/rooms/section7/room706.h"
 #include "m4/burger/rooms/section7/section7.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section8/room801.cpp b/engines/m4/burger/rooms/section8/room801.cpp
index b8bcad1b4fc..10db02572fd 100644
--- a/engines/m4/burger/rooms/section8/room801.cpp
+++ b/engines/m4/burger/rooms/section8/room801.cpp
@@ -21,8 +21,10 @@
 
 #include "m4/burger/rooms/section8/room801.h"
 #include "m4/burger/rooms/section8/section8.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {
diff --git a/engines/m4/burger/rooms/section8/room802.cpp b/engines/m4/burger/rooms/section8/room802.cpp
index 9c7f2419b29..0b81f43e1eb 100644
--- a/engines/m4/burger/rooms/section8/room802.cpp
+++ b/engines/m4/burger/rooms/section8/room802.cpp
@@ -21,8 +21,10 @@
 
 #include "m4/burger/rooms/section8/room802.h"
 #include "m4/burger/rooms/section8/section8.h"
+#include "m4/burger/core/conv.h"
 #include "m4/burger/vars.h"
 #include "m4/adv_r/adv_control.h"
+#include "m4/core/imath.h"
 
 namespace M4 {
 namespace Burger {


Commit: 180ada385e08c7173e8678b15e5be8f5b261efd0
    https://github.com/scummvm/scummvm/commit/180ada385e08c7173e8678b15e5be8f5b261efd0
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-16T10:16:29+01:00

Commit Message:
M4: BURGER: Remove unused room variable in room 104

Changed paths:
    engines/m4/burger/rooms/section1/room104.cpp
    engines/m4/burger/rooms/section1/room104.h


diff --git a/engines/m4/burger/rooms/section1/room104.cpp b/engines/m4/burger/rooms/section1/room104.cpp
index ff274b4073b..b206ed656ba 100644
--- a/engines/m4/burger/rooms/section1/room104.cpp
+++ b/engines/m4/burger/rooms/section1/room104.cpp
@@ -59,7 +59,6 @@ static const seriesPlayBreak PLAY2[] = {
 void Room104::init() {
 	_stolieSleepCtr = 0;
 	_stolieShould = 14;
-	_val3 = 0;
 
 	digi_preload("104_001");
 
@@ -531,16 +530,16 @@ void Room104::freeSeries() {
 int Room104::getRandom() const {
 	if (imath_ranged_rand(1, 4) == 1) {
 		return imath_ranged_rand(3, 4);
-	} else {
-		switch (imath_ranged_rand(1, 5)) {
-		case 1:
-		case 2:
-			return 1;
-		case 3:
-			return 2;
-		default:
-			return 5;
-		}
+	}
+
+	switch (imath_ranged_rand(1, 5)) {
+	case 1:
+	case 2:
+		return 1;
+	case 3:
+		return 2;
+	default:
+		return 5;
 	}
 }
 
diff --git a/engines/m4/burger/rooms/section1/room104.h b/engines/m4/burger/rooms/section1/room104.h
index 5192a792bb9..1cf0f949702 100644
--- a/engines/m4/burger/rooms/section1/room104.h
+++ b/engines/m4/burger/rooms/section1/room104.h
@@ -32,7 +32,6 @@ class Room104 : public Room {
 private:
 	int _stolieSleepCtr = 0;
 	int _stolieShould = 14;
-	int _val3 = 0;
 	bool _flag1 = false;
 	Series _series1;

More information about the Scummvm-git-logs mailing list