[Scummvm-git-logs] scummvm master -> e5af77436207a2be205c5d89fc1367c4fc72e021
Strangerke
noreply at scummvm.org
Tue Feb 10 22:39:55 UTC 2026
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:
e5af774362 M4: cleanup includes in rooms, remove some useless functions in imath and mouse
Commit: e5af77436207a2be205c5d89fc1367c4fc72e021
https://github.com/scummvm/scummvm/commit/e5af77436207a2be205c5d89fc1367c4fc72e021
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-10T23:39:23+01:00
Commit Message:
M4: cleanup includes in rooms, remove some useless functions in imath and mouse
Changed paths:
engines/m4/burger/burger.cpp
engines/m4/burger/other.cpp
engines/m4/burger/rooms/section.cpp
engines/m4/burger/rooms/section1/room101.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/room120.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/room170.cpp
engines/m4/burger/rooms/section1/room171.cpp
engines/m4/burger/rooms/section1/room172.cpp
engines/m4/burger/rooms/section1/room174.cpp
engines/m4/burger/rooms/section1/section1.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/room303.cpp
engines/m4/burger/rooms/section3/room304.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/room401.cpp
engines/m4/burger/rooms/section4/room402.cpp
engines/m4/burger/rooms/section4/room404.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/section4/section4_room.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/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/section6.cpp
engines/m4/burger/rooms/section7/room701.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
engines/m4/burger/rooms/section9/room901.cpp
engines/m4/burger/rooms/section9/room904.cpp
engines/m4/burger/rooms/section9/room971.cpp
engines/m4/core/cstring.h
engines/m4/core/globals.h
engines/m4/core/imath.cpp
engines/m4/core/imath.h
engines/m4/core/mouse.cpp
engines/m4/core/mouse.h
engines/m4/core/rooms.h
engines/m4/riddle/riddle.cpp
engines/m4/riddle/rooms/section2/room201.cpp
engines/m4/riddle/rooms/section2/room202.cpp
engines/m4/riddle/rooms/section2/room203.cpp
engines/m4/riddle/rooms/section2/room204.cpp
engines/m4/riddle/rooms/section2/room205.cpp
engines/m4/riddle/rooms/section2/room207.cpp
engines/m4/riddle/rooms/section2/room207.h
engines/m4/riddle/rooms/section3/room301.cpp
engines/m4/riddle/rooms/section3/room301.h
engines/m4/riddle/rooms/section3/room303.cpp
engines/m4/riddle/rooms/section3/room303.h
engines/m4/riddle/rooms/section3/room304.cpp
engines/m4/riddle/rooms/section3/room305.cpp
engines/m4/riddle/rooms/section3/room305.h
engines/m4/riddle/rooms/section3/room309.cpp
engines/m4/riddle/rooms/section3/room352.cpp
engines/m4/riddle/rooms/section3/room354.cpp
engines/m4/riddle/rooms/section4/room401.cpp
engines/m4/riddle/rooms/section4/room402.cpp
engines/m4/riddle/rooms/section4/room403.cpp
engines/m4/riddle/rooms/section4/room404.cpp
engines/m4/riddle/rooms/section4/room405.cpp
engines/m4/riddle/rooms/section4/room406.cpp
engines/m4/riddle/rooms/section4/room407.cpp
engines/m4/riddle/rooms/section4/room408.cpp
engines/m4/riddle/rooms/section4/room409.cpp
engines/m4/riddle/rooms/section4/room410.cpp
engines/m4/riddle/rooms/section4/room413.cpp
engines/m4/riddle/rooms/section4/room456.cpp
engines/m4/riddle/rooms/section4/room493.cpp
engines/m4/riddle/rooms/section4/room494.cpp
engines/m4/riddle/rooms/section4/room495.cpp
engines/m4/riddle/rooms/section5/room501.cpp
engines/m4/riddle/rooms/section5/room504.cpp
engines/m4/riddle/rooms/section5/room506.cpp
engines/m4/riddle/rooms/section5/room507.cpp
engines/m4/riddle/rooms/section5/room508.cpp
engines/m4/riddle/rooms/section5/room509.cpp
engines/m4/riddle/rooms/section5/room510.cpp
engines/m4/riddle/rooms/section6/room603.cpp
engines/m4/riddle/rooms/section6/room604.cpp
engines/m4/riddle/rooms/section6/room605.cpp
engines/m4/riddle/rooms/section6/room607.cpp
engines/m4/riddle/rooms/section6/room608.cpp
engines/m4/riddle/rooms/section6/room610.cpp
engines/m4/riddle/rooms/section6/room615.cpp
engines/m4/riddle/rooms/section6/room620.cpp
engines/m4/riddle/rooms/section6/room621.cpp
engines/m4/riddle/rooms/section6/room622.cpp
engines/m4/riddle/rooms/section6/room623.cpp
engines/m4/riddle/rooms/section6/room624.cpp
engines/m4/riddle/rooms/section6/room625.cpp
engines/m4/riddle/rooms/section6/room626.cpp
engines/m4/riddle/rooms/section6/room627.cpp
engines/m4/riddle/rooms/section6/room628.cpp
engines/m4/riddle/rooms/section6/room629.cpp
engines/m4/riddle/rooms/section6/room630.cpp
engines/m4/riddle/rooms/section6/room631.cpp
engines/m4/riddle/rooms/section6/room632.cpp
engines/m4/riddle/rooms/section6/room633.cpp
engines/m4/riddle/rooms/section6/room634.cpp
engines/m4/riddle/rooms/section6/room635.cpp
engines/m4/riddle/rooms/section6/room636.cpp
engines/m4/riddle/rooms/section6/room637.cpp
engines/m4/riddle/rooms/section6/room638.cpp
engines/m4/riddle/rooms/section6/room640.cpp
engines/m4/riddle/rooms/section6/room641.cpp
engines/m4/riddle/rooms/section6/room642.cpp
engines/m4/riddle/rooms/section6/room643.cpp
engines/m4/riddle/rooms/section6/room644.cpp
engines/m4/riddle/rooms/section6/room645.cpp
engines/m4/riddle/rooms/section6/room646.cpp
engines/m4/riddle/rooms/section6/room647.cpp
engines/m4/riddle/rooms/section6/room648.cpp
engines/m4/riddle/rooms/section6/room650.cpp
engines/m4/riddle/rooms/section6/room651.cpp
engines/m4/riddle/rooms/section6/section6_maze.cpp
engines/m4/riddle/rooms/section7/room701.cpp
engines/m4/riddle/rooms/section7/room702.cpp
engines/m4/riddle/rooms/section7/room703.cpp
engines/m4/riddle/rooms/section7/room704.cpp
engines/m4/riddle/rooms/section7/room705.cpp
engines/m4/riddle/rooms/section7/room706.cpp
engines/m4/riddle/rooms/section7/room707.cpp
engines/m4/riddle/rooms/section7/room709.cpp
engines/m4/riddle/rooms/section7/room710.cpp
engines/m4/riddle/rooms/section7/room711.cpp
engines/m4/riddle/rooms/section8/room801.cpp
engines/m4/riddle/rooms/section8/room802.cpp
engines/m4/riddle/rooms/section8/room803.cpp
engines/m4/riddle/rooms/section8/room804.cpp
engines/m4/riddle/rooms/section8/room805.cpp
engines/m4/riddle/rooms/section8/room806.cpp
engines/m4/riddle/rooms/section8/room807.cpp
engines/m4/riddle/rooms/section8/room808.cpp
engines/m4/riddle/rooms/section8/room809.cpp
engines/m4/riddle/rooms/section8/room810.cpp
engines/m4/riddle/rooms/section8/room811.cpp
engines/m4/riddle/rooms/section8/room814.cpp
engines/m4/riddle/rooms/section8/room818.cpp
engines/m4/riddle/rooms/section8/room824.cpp
engines/m4/riddle/rooms/section8/room834.cpp
engines/m4/riddle/rooms/section8/room844.cpp
engines/m4/riddle/rooms/section8/room850.cpp
engines/m4/riddle/rooms/section8/room852.cpp
engines/m4/riddle/rooms/section8/room860.cpp
engines/m4/riddle/rooms/section8/room861.cpp
engines/m4/riddle/rooms/section8/section8_room.cpp
engines/m4/riddle/rooms/section9/room901.cpp
engines/m4/riddle/rooms/section9/room902.cpp
engines/m4/riddle/rooms/section9/room903.cpp
engines/m4/riddle/rooms/section9/room903.h
engines/m4/riddle/rooms/section9/room905.cpp
engines/m4/riddle/rooms/section9/room905.h
engines/m4/riddle/rooms/section9/room906.cpp
engines/m4/riddle/rooms/section9/room907.cpp
engines/m4/riddle/rooms/section9/room908.cpp
engines/m4/riddle/rooms/section9/room917.cpp
engines/m4/riddle/rooms/section9/room918.cpp
engines/m4/riddle/rooms/section9/room996.cpp
engines/m4/vars.cpp
diff --git a/engines/m4/burger/burger.cpp b/engines/m4/burger/burger.cpp
index 53eeabe61e9..d69edbbd815 100644
--- a/engines/m4/burger/burger.cpp
+++ b/engines/m4/burger/burger.cpp
@@ -26,9 +26,10 @@
#include "m4/burger/core/conv.h"
#include "m4/burger/gui/gui_gizmo.h"
#include "m4/burger/gui/game_menu.h"
-#include "m4/graphics/krn_pal.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/core/errors.h"
#include "m4/core/imath.h"
+#include "m4/graphics/krn_pal.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/other.cpp b/engines/m4/burger/other.cpp
index cd55cc4a9cd..55de90c2780 100644
--- a/engines/m4/burger/other.cpp
+++ b/engines/m4/burger/other.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/burger/other.h"
-#include "m4/core/errors.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/core/errors.h"
#include "m4/m4.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section.cpp b/engines/m4/burger/rooms/section.cpp
index 6935a12d62a..c6962dba022 100644
--- a/engines/m4/burger/rooms/section.cpp
+++ b/engines/m4/burger/rooms/section.cpp
@@ -23,6 +23,7 @@
#include "m4/gui/gui_vmng.h"
#include "m4/burger/vars.h"
#include "m4/m4.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room101.cpp b/engines/m4/burger/rooms/section1/room101.cpp
index f28e9ebdccb..6313130653a 100644
--- a/engines/m4/burger/rooms/section1/room101.cpp
+++ b/engines/m4/burger/rooms/section1/room101.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room101.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/core/imath.h"
diff --git a/engines/m4/burger/rooms/section1/room102.cpp b/engines/m4/burger/rooms/section1/room102.cpp
index fa17a6fee64..f274ea1590e 100644
--- a/engines/m4/burger/rooms/section1/room102.cpp
+++ b/engines/m4/burger/rooms/section1/room102.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room102.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/core/imath.h"
#include "m4/graphics/gr_series.h"
#include "m4/platform/timer.h"
diff --git a/engines/m4/burger/rooms/section1/room103.cpp b/engines/m4/burger/rooms/section1/room103.cpp
index ebd8bd58724..8fb90b25db7 100644
--- a/engines/m4/burger/rooms/section1/room103.cpp
+++ b/engines/m4/burger/rooms/section1/room103.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room103.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/room104.cpp b/engines/m4/burger/rooms/section1/room104.cpp
index 7c38f258312..9cfb9c13b2c 100644
--- a/engines/m4/burger/rooms/section1/room104.cpp
+++ b/engines/m4/burger/rooms/section1/room104.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room104.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/core/imath.h"
#include "m4/graphics/gr_series.h"
diff --git a/engines/m4/burger/rooms/section1/room105.cpp b/engines/m4/burger/rooms/section1/room105.cpp
index 9503ca9bf7a..cb26f51d75a 100644
--- a/engines/m4/burger/rooms/section1/room105.cpp
+++ b/engines/m4/burger/rooms/section1/room105.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room105.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/room106.cpp b/engines/m4/burger/rooms/section1/room106.cpp
index 8aaed7f35a0..5563e32ba32 100644
--- a/engines/m4/burger/rooms/section1/room106.cpp
+++ b/engines/m4/burger/rooms/section1/room106.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room106.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/room120.cpp b/engines/m4/burger/rooms/section1/room120.cpp
index 02f3a4c9494..241982db3be 100644
--- a/engines/m4/burger/rooms/section1/room120.cpp
+++ b/engines/m4/burger/rooms/section1/room120.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room120.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.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 6d55f8e7f01..b9ad4268330 100644
--- a/engines/m4/burger/rooms/section1/room133_136.cpp
+++ b/engines/m4/burger/rooms/section1/room133_136.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room133_136.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/room134_135.cpp b/engines/m4/burger/rooms/section1/room134_135.cpp
index 0279beeeca7..7eadf2afe27 100644
--- a/engines/m4/burger/rooms/section1/room134_135.cpp
+++ b/engines/m4/burger/rooms/section1/room134_135.cpp
@@ -22,6 +22,8 @@
#include "m4/burger/rooms/section1/room134_135.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room137.cpp b/engines/m4/burger/rooms/section1/room137.cpp
index 7631397acba..37c8cb1e7a6 100644
--- a/engines/m4/burger/rooms/section1/room137.cpp
+++ b/engines/m4/burger/rooms/section1/room137.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room137.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/room138.cpp b/engines/m4/burger/rooms/section1/room138.cpp
index 35bec913aa2..5886d094e05 100644
--- a/engines/m4/burger/rooms/section1/room138.cpp
+++ b/engines/m4/burger/rooms/section1/room138.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room138.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/room139_144.cpp b/engines/m4/burger/rooms/section1/room139_144.cpp
index c01da20a7b8..3f494575ef1 100644
--- a/engines/m4/burger/rooms/section1/room139_144.cpp
+++ b/engines/m4/burger/rooms/section1/room139_144.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room139_144.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/room140_141.cpp b/engines/m4/burger/rooms/section1/room140_141.cpp
index 85f0404f134..448f9ab9d62 100644
--- a/engines/m4/burger/rooms/section1/room140_141.cpp
+++ b/engines/m4/burger/rooms/section1/room140_141.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room140_141.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/room142.cpp b/engines/m4/burger/rooms/section1/room142.cpp
index a973c1db0b6..edf555b088a 100644
--- a/engines/m4/burger/rooms/section1/room142.cpp
+++ b/engines/m4/burger/rooms/section1/room142.cpp
@@ -23,6 +23,7 @@
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/burger.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/room143.cpp b/engines/m4/burger/rooms/section1/room143.cpp
index 69c728dc13b..930ce3a9fb8 100644
--- a/engines/m4/burger/rooms/section1/room143.cpp
+++ b/engines/m4/burger/rooms/section1/room143.cpp
@@ -23,6 +23,7 @@
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/burger.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room145.cpp b/engines/m4/burger/rooms/section1/room145.cpp
index 9b750d0d1c4..fd58d16631f 100644
--- a/engines/m4/burger/rooms/section1/room145.cpp
+++ b/engines/m4/burger/rooms/section1/room145.cpp
@@ -23,6 +23,7 @@
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/burger.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section1/room170.cpp b/engines/m4/burger/rooms/section1/room170.cpp
index 8d16441eb02..f07688a9c50 100644
--- a/engines/m4/burger/rooms/section1/room170.cpp
+++ b/engines/m4/burger/rooms/section1/room170.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room170.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/room171.cpp b/engines/m4/burger/rooms/section1/room171.cpp
index f678445b3bc..bd9ea33fa22 100644
--- a/engines/m4/burger/rooms/section1/room171.cpp
+++ b/engines/m4/burger/rooms/section1/room171.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room171.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/room172.cpp b/engines/m4/burger/rooms/section1/room172.cpp
index 78b74d330b3..a11a6b9fcf4 100644
--- a/engines/m4/burger/rooms/section1/room172.cpp
+++ b/engines/m4/burger/rooms/section1/room172.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room172.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/room174.cpp b/engines/m4/burger/rooms/section1/room174.cpp
index b21f241a70e..2c030f1f171 100644
--- a/engines/m4/burger/rooms/section1/room174.cpp
+++ b/engines/m4/burger/rooms/section1/room174.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section1/room174.h"
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section1/section1.cpp b/engines/m4/burger/rooms/section1/section1.cpp
index 7f68f1141cb..d7ed211790c 100644
--- a/engines/m4/burger/rooms/section1/section1.cpp
+++ b/engines/m4/burger/rooms/section1/section1.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section1/section1.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/core/imath.h"
#include "m4/m4.h"
diff --git a/engines/m4/burger/rooms/section2/room207.cpp b/engines/m4/burger/rooms/section2/room207.cpp
index a99497cc24e..13e60d46387 100644
--- a/engines/m4/burger/rooms/section2/room207.cpp
+++ b/engines/m4/burger/rooms/section2/room207.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section2/room207.h"
#include "m4/burger/burger.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section3/mine.cpp b/engines/m4/burger/rooms/section3/mine.cpp
index 34f2a8c29bc..faf620ee0f8 100644
--- a/engines/m4/burger/rooms/section3/mine.cpp
+++ b/engines/m4/burger/rooms/section3/mine.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section3/mine.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section3/room302.cpp b/engines/m4/burger/rooms/section3/room302.cpp
index 2c0316c1c82..e4d50ce24ae 100644
--- a/engines/m4/burger/rooms/section3/room302.cpp
+++ b/engines/m4/burger/rooms/section3/room302.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section3/room302.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section3/room303.cpp b/engines/m4/burger/rooms/section3/room303.cpp
index da6fd9a4cef..0532c94c94d 100644
--- a/engines/m4/burger/rooms/section3/room303.cpp
+++ b/engines/m4/burger/rooms/section3/room303.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section3/room303.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/platform/timer.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section3/room304.cpp b/engines/m4/burger/rooms/section3/room304.cpp
index f9eaa09486b..6f0c86485d5 100644
--- a/engines/m4/burger/rooms/section3/room304.cpp
+++ b/engines/m4/burger/rooms/section3/room304.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section3/room304.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section3/room305.cpp b/engines/m4/burger/rooms/section3/room305.cpp
index c5dd96ddf53..62dae22f170 100644
--- a/engines/m4/burger/rooms/section3/room305.cpp
+++ b/engines/m4/burger/rooms/section3/room305.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section3/room305.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section3/room310.cpp b/engines/m4/burger/rooms/section3/room310.cpp
index b82c8d7e1a4..42e23ebe94c 100644
--- a/engines/m4/burger/rooms/section3/room310.cpp
+++ b/engines/m4/burger/rooms/section3/room310.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section3/room310.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section3/section3.cpp b/engines/m4/burger/rooms/section3/section3.cpp
index ae235a4351a..681effcd1e1 100644
--- a/engines/m4/burger/rooms/section3/section3.cpp
+++ b/engines/m4/burger/rooms/section3/section3.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section3/section3.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/room401.cpp b/engines/m4/burger/rooms/section4/room401.cpp
index 89b530d3b73..0b1352ea5cb 100644
--- a/engines/m4/burger/rooms/section4/room401.cpp
+++ b/engines/m4/burger/rooms/section4/room401.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section4/room401.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/room402.cpp b/engines/m4/burger/rooms/section4/room402.cpp
index afe1be4f564..67d7eec2fd8 100644
--- a/engines/m4/burger/rooms/section4/room402.cpp
+++ b/engines/m4/burger/rooms/section4/room402.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section4/room402.h"
#include "m4/burger/rooms/section4/section4.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/room404.cpp b/engines/m4/burger/rooms/section4/room404.cpp
index 67618127b71..4f37a20582a 100644
--- a/engines/m4/burger/rooms/section4/room404.cpp
+++ b/engines/m4/burger/rooms/section4/room404.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section4/room404.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/room405.cpp b/engines/m4/burger/rooms/section4/room405.cpp
index 4436f669eda..856d3af852b 100644
--- a/engines/m4/burger/rooms/section4/room405.cpp
+++ b/engines/m4/burger/rooms/section4/room405.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section4/room405.h"
#include "m4/burger/rooms/section4/section4.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/room406.cpp b/engines/m4/burger/rooms/section4/room406.cpp
index b5e18fe1fe6..1b5b23f3db1 100644
--- a/engines/m4/burger/rooms/section4/room406.cpp
+++ b/engines/m4/burger/rooms/section4/room406.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section4/room406.h"
#include "m4/burger/burger.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/room407.cpp b/engines/m4/burger/rooms/section4/room407.cpp
index b46e7576758..376eedcf29c 100644
--- a/engines/m4/burger/rooms/section4/room407.cpp
+++ b/engines/m4/burger/rooms/section4/room407.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section4/room407.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/section4.cpp b/engines/m4/burger/rooms/section4/section4.cpp
index 0d06ad07806..b6d8701fd4d 100644
--- a/engines/m4/burger/rooms/section4/section4.cpp
+++ b/engines/m4/burger/rooms/section4/section4.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section4/section4.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section4/section4_room.cpp b/engines/m4/burger/rooms/section4/section4_room.cpp
index eabde8c67b0..6932f477d5d 100644
--- a/engines/m4/burger/rooms/section4/section4_room.cpp
+++ b/engines/m4/burger/rooms/section4/section4_room.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section4/section4_room.h"
#include "m4/burger/rooms/section4/section4.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room502.cpp b/engines/m4/burger/rooms/section5/room502.cpp
index cd0004efc09..f75a4660631 100644
--- a/engines/m4/burger/rooms/section5/room502.cpp
+++ b/engines/m4/burger/rooms/section5/room502.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section5/room502.h"
#include "m4/burger/rooms/section5/section5.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room503.cpp b/engines/m4/burger/rooms/section5/room503.cpp
index 4ff1666e7ac..05e0e6a1077 100644
--- a/engines/m4/burger/rooms/section5/room503.cpp
+++ b/engines/m4/burger/rooms/section5/room503.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section5/room503.h"
#include "m4/burger/rooms/section5/section5.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/adv_hotspot.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section5/room504.cpp b/engines/m4/burger/rooms/section5/room504.cpp
index 6e3dcef0b2f..a252cd14719 100644
--- a/engines/m4/burger/rooms/section5/room504.cpp
+++ b/engines/m4/burger/rooms/section5/room504.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section5/room504.h"
#include "m4/burger/rooms/section5/section5.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room505.cpp b/engines/m4/burger/rooms/section5/room505.cpp
index d98cb2de909..de770788e46 100644
--- a/engines/m4/burger/rooms/section5/room505.cpp
+++ b/engines/m4/burger/rooms/section5/room505.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section5/room505.h"
#include "m4/burger/rooms/section5/section5.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room506.cpp b/engines/m4/burger/rooms/section5/room506.cpp
index 0f126d8c735..6c26e1026f2 100644
--- a/engines/m4/burger/rooms/section5/room506.cpp
+++ b/engines/m4/burger/rooms/section5/room506.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section5/room506.h"
#include "m4/burger/rooms/section5/section5.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room507.cpp b/engines/m4/burger/rooms/section5/room507.cpp
index c61e293d7f2..59a30870f1a 100644
--- a/engines/m4/burger/rooms/section5/room507.cpp
+++ b/engines/m4/burger/rooms/section5/room507.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section5/room507.h"
#include "m4/burger/rooms/section5/section5.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room508.cpp b/engines/m4/burger/rooms/section5/room508.cpp
index 3ee55e40f91..ba84af5dc58 100644
--- a/engines/m4/burger/rooms/section5/room508.cpp
+++ b/engines/m4/burger/rooms/section5/room508.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section5/room508.h"
#include "m4/burger/rooms/section5/section5.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room509.cpp b/engines/m4/burger/rooms/section5/room509.cpp
index 93b9ffe94f0..308979cac82 100644
--- a/engines/m4/burger/rooms/section5/room509.cpp
+++ b/engines/m4/burger/rooms/section5/room509.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section5/room509.h"
#include "m4/burger/rooms/section5/section5.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/room510.cpp b/engines/m4/burger/rooms/section5/room510.cpp
index 5433aa80983..dba20460251 100644
--- a/engines/m4/burger/rooms/section5/room510.cpp
+++ b/engines/m4/burger/rooms/section5/room510.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section5/room510.h"
#include "m4/burger/rooms/section5/section5.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section5/section5.cpp b/engines/m4/burger/rooms/section5/section5.cpp
index 22099e8ceb7..31a6c067532 100644
--- a/engines/m4/burger/rooms/section5/section5.cpp
+++ b/engines/m4/burger/rooms/section5/section5.cpp
@@ -23,6 +23,7 @@
#include "m4/burger/gui/gui_gizmo.h"
#include "m4/burger/vars.h"
#include "m4/burger/burger.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/gui/gui_sys.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section6/room602.cpp b/engines/m4/burger/rooms/section6/room602.cpp
index ec0cc27a46f..59cf33c2466 100644
--- a/engines/m4/burger/rooms/section6/room602.cpp
+++ b/engines/m4/burger/rooms/section6/room602.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section6/room602.h"
#include "m4/burger/rooms/section6/section6.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section6/room603.cpp b/engines/m4/burger/rooms/section6/room603.cpp
index 530860130f8..1ab2bc48aab 100644
--- a/engines/m4/burger/rooms/section6/room603.cpp
+++ b/engines/m4/burger/rooms/section6/room603.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section6/room603.h"
#include "m4/burger/rooms/section6/section6.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section6/room604.cpp b/engines/m4/burger/rooms/section6/room604.cpp
index 7f9d63554de..99572805cbf 100644
--- a/engines/m4/burger/rooms/section6/room604.cpp
+++ b/engines/m4/burger/rooms/section6/room604.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section6/room604.h"
#include "m4/burger/rooms/section6/section6.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section6/section6.cpp b/engines/m4/burger/rooms/section6/section6.cpp
index e89bda6049d..653b796fb23 100644
--- a/engines/m4/burger/rooms/section6/section6.cpp
+++ b/engines/m4/burger/rooms/section6/section6.cpp
@@ -21,6 +21,8 @@
#include "m4/burger/rooms/section6/section6.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section7/room701.cpp b/engines/m4/burger/rooms/section7/room701.cpp
index 7b3e63d46c9..4323c84293e 100644
--- a/engines/m4/burger/rooms/section7/room701.cpp
+++ b/engines/m4/burger/rooms/section7/room701.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section7/room701.h"
#include "m4/burger/rooms/section7/section7.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section7/room702.cpp b/engines/m4/burger/rooms/section7/room702.cpp
index c11bb267a4b..ed9b347f95d 100644
--- a/engines/m4/burger/rooms/section7/room702.cpp
+++ b/engines/m4/burger/rooms/section7/room702.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section7/room702.h"
#include "m4/burger/rooms/section7/section7.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section7/room706.cpp b/engines/m4/burger/rooms/section7/room706.cpp
index 55e0bd8a530..ba48fccaffb 100644
--- a/engines/m4/burger/rooms/section7/room706.cpp
+++ b/engines/m4/burger/rooms/section7/room706.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section7/room706.h"
#include "m4/burger/rooms/section7/section7.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section8/room801.cpp b/engines/m4/burger/rooms/section8/room801.cpp
index 573cc039faf..b8bcad1b4fc 100644
--- a/engines/m4/burger/rooms/section8/room801.cpp
+++ b/engines/m4/burger/rooms/section8/room801.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section8/room801.h"
#include "m4/burger/rooms/section8/section8.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section8/room802.cpp b/engines/m4/burger/rooms/section8/room802.cpp
index d342cf2683d..770fd6333d0 100644
--- a/engines/m4/burger/rooms/section8/room802.cpp
+++ b/engines/m4/burger/rooms/section8/room802.cpp
@@ -22,6 +22,7 @@
#include "m4/burger/rooms/section8/room802.h"
#include "m4/burger/rooms/section8/section8.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section9/room901.cpp b/engines/m4/burger/rooms/section9/room901.cpp
index 64450482983..2abaf7b9beb 100644
--- a/engines/m4/burger/rooms/section9/room901.cpp
+++ b/engines/m4/burger/rooms/section9/room901.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/burger/rooms/section9/room901.h"
-#include "m4/graphics/gr_series.h"
#include "m4/burger/vars.h"
#include "m4/burger/burger.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Burger {
diff --git a/engines/m4/burger/rooms/section9/room904.cpp b/engines/m4/burger/rooms/section9/room904.cpp
index 2f243af0d98..b80c139411b 100644
--- a/engines/m4/burger/rooms/section9/room904.cpp
+++ b/engines/m4/burger/rooms/section9/room904.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/burger/rooms/section9/room904.h"
-#include "m4/core/errors.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/core/errors.h"
#include "m4/m4.h"
namespace M4 {
diff --git a/engines/m4/burger/rooms/section9/room971.cpp b/engines/m4/burger/rooms/section9/room971.cpp
index 09671756d8e..1b24d4372f6 100644
--- a/engines/m4/burger/rooms/section9/room971.cpp
+++ b/engines/m4/burger/rooms/section9/room971.cpp
@@ -21,6 +21,7 @@
#include "m4/burger/rooms/section9/room971.h"
#include "m4/burger/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/m4.h"
namespace M4 {
diff --git a/engines/m4/core/cstring.h b/engines/m4/core/cstring.h
index 7e2611b896b..20e31920eca 100644
--- a/engines/m4/core/cstring.h
+++ b/engines/m4/core/cstring.h
@@ -26,15 +26,11 @@
namespace M4 {
-#define STR_PARSE_BUFFER_SIZE 255
-
int32 cstrlen(const char *s);
void cstrcpy(char *dest, const char *src);
void cstrncpy(char *dest, const char *src, const int16 max_len);
char *cstrupr(char *src);
-#define strrun(a,b,c) memset(a,b,c)
-
} // namespace M4
#endif
diff --git a/engines/m4/core/globals.h b/engines/m4/core/globals.h
index fb233ac4a03..454e8eccb3f 100644
--- a/engines/m4/core/globals.h
+++ b/engines/m4/core/globals.h
@@ -26,10 +26,6 @@
#ifndef M4_CORE_GLOBALS_H
#define M4_CORE_GLOBALS_H
-#include "common/array.h"
-#include "common/serializer.h"
-#include "m4/fileio/sys_file.h"
-#include "m4/m4_types.h"
namespace M4 {
diff --git a/engines/m4/core/imath.cpp b/engines/m4/core/imath.cpp
index 82d1f372a78..e44dfb56976 100644
--- a/engines/m4/core/imath.cpp
+++ b/engines/m4/core/imath.cpp
@@ -24,33 +24,6 @@
namespace M4 {
-unsigned long sqrtul(unsigned long v) {
- unsigned long r = 0, s;
-
-#define STEP(k) s = r + (1L << (k * 2)); r >>= 1; \
- if (s <= v) { v -= s; r |= (1L << (k * 2)); }
-
- STEP(15);
- STEP(14);
- STEP(13);
- STEP(12);
- STEP(11);
- STEP(10);
- STEP(9);
- STEP(8);
- STEP(7);
- STEP(6);
- STEP(5);
- STEP(4);
- STEP(3);
- STEP(2);
- STEP(1);
- STEP(0);
-
- return r;
-#undef STEP
-}
-
int32 imath_min(int32 a, int32 b) {
return ((a < b) ? a : b);
}
@@ -87,14 +60,6 @@ bool imath_rand_bool(int max) {
return imath_ranged_rand(1, max) == 1;
}
-frac16 dist2d(int32 x1, int32 y1, int32 x2, int32 y2) {
- if ((x2 -= x1) < 0)
- x2 = -x2;
- if ((y2 -= y1) < 0)
- y2 = -y2;
- return (x2 + y2 - (((x2 > y2) ? y2 : x2) >> 1));
-}
-
#define STEP(k) s = r + (1L << (k * 2)); r >>= 1; \
if (s <= v) { v -= s; r |= (1L << (k * 2)); }
@@ -133,14 +98,6 @@ frac16 ArcTan(frac16 x, frac16 y) {
return fracResult;
}
-uint16 HighWord(uint32 n) {
- return (uint16)(n >> 16);
-}
-
-uint16 LowWord(uint32 n) {
- return (uint16)(n & 0xffff);
-}
-
uint32 convert_intel32(uint32 a) {
return FROM_LE_32(a);
}
diff --git a/engines/m4/core/imath.h b/engines/m4/core/imath.h
index 0650dcea0f6..d7815533497 100644
--- a/engines/m4/core/imath.h
+++ b/engines/m4/core/imath.h
@@ -43,25 +43,19 @@ namespace M4 {
frac16 FixedMul(frac16 Multiplicand, frac16 Multiplier);
frac16 FixedDiv(frac16 Dividend, frac16 Divisor);
-unsigned long sqrtul(unsigned long v);
-
int32 imath_max(int32 a, int32 b);
int32 imath_min(int32 a, int32 b);
int32 imath_abs(int32 a);
void imath_seed(int32 seedNum);
-uint32 imath_random();
+
int32 imath_ranged_rand(int32 a, int32 b);
frac16 imath_ranged_rand16(frac16 a, frac16 b);
bool imath_rand_bool(int max);
-frac16 dist2d(int32 x1, int32 y1, int32 x2, int32 y2);
frac16 SqrtF16(frac16 n);
frac16 ArcTan(frac16 x, frac16 y);
-uint16 HighWord(uint32 n);
-uint16 LowWord(uint32 n);
-
uint32 convert_intel32(uint32 a);
uint16 convert_intel16(uint16 a);
@@ -77,10 +71,6 @@ inline long abs(long a) {
return (a >= 0) ? a : -a;
}
-inline int16 convert_intel16(void *src) {
- return READ_LE_INT16(src);
-}
-
} // namespace M4
#endif
diff --git a/engines/m4/core/mouse.cpp b/engines/m4/core/mouse.cpp
index 004a3df2b8c..e974d8dbbbd 100644
--- a/engines/m4/core/mouse.cpp
+++ b/engines/m4/core/mouse.cpp
@@ -59,19 +59,6 @@ static byte Pointer[] = {
00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00
};
-// returns FALSE if the mouse couldn't be initialized
-int mouse_init() {
- auto &ms = _G(MouseState);
- ms.CursorColumn = 640 / 2;
- ms.CursorRow = 480 / 2;
-
- return true;
-}
-
-void mouse_uninstall() {
- // No implementation
-}
-
byte *GetMousePicture() {
return &Pointer[0];
}
diff --git a/engines/m4/core/mouse.h b/engines/m4/core/mouse.h
index adf78e234ef..625fbc32230 100644
--- a/engines/m4/core/mouse.h
+++ b/engines/m4/core/mouse.h
@@ -37,8 +37,6 @@ struct MouseDriverInfo {
byte MouseIRQ = 0;
};
-int mouse_init();
-void mouse_uninstall();
byte *GetMousePicture();
} // namespace M4
diff --git a/engines/m4/core/rooms.h b/engines/m4/core/rooms.h
index 54f292c26a7..37b81b9dc76 100644
--- a/engines/m4/core/rooms.h
+++ b/engines/m4/core/rooms.h
@@ -24,8 +24,6 @@
#include "common/hashmap.h"
#include "common/serializer.h"
-#include "m4/adv_r/adv.h"
-#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/adv_hotspot.h"
namespace M4 {
diff --git a/engines/m4/riddle/riddle.cpp b/engines/m4/riddle/riddle.cpp
index 6c12da81f77..b13e964cf6e 100644
--- a/engines/m4/riddle/riddle.cpp
+++ b/engines/m4/riddle/riddle.cpp
@@ -26,6 +26,7 @@
#include "m4/riddle/triggers.h"
#include "m4/riddle/console.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/other.h"
#include "m4/console.h"
diff --git a/engines/m4/riddle/rooms/section2/room201.cpp b/engines/m4/riddle/rooms/section2/room201.cpp
index 994cfbaec36..b73d23aaaed 100644
--- a/engines/m4/riddle/rooms/section2/room201.cpp
+++ b/engines/m4/riddle/rooms/section2/room201.cpp
@@ -21,8 +21,9 @@
#include "m4/riddle/rooms/section2/room201.h"
#include "m4/riddle/rooms/section2/section2.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section2/room202.cpp b/engines/m4/riddle/rooms/section2/room202.cpp
index ca033596cab..bd1106023cc 100644
--- a/engines/m4/riddle/rooms/section2/room202.cpp
+++ b/engines/m4/riddle/rooms/section2/room202.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section2/room202.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section2/room203.cpp b/engines/m4/riddle/rooms/section2/room203.cpp
index 4b03beeb3dd..5d506ab1742 100644
--- a/engines/m4/riddle/rooms/section2/room203.cpp
+++ b/engines/m4/riddle/rooms/section2/room203.cpp
@@ -22,10 +22,11 @@
#include "m4/riddle/rooms/section2/room203.h"
#include "m4/riddle/rooms/section2/section2.h"
#include "m4/riddle/vars.h"
+#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/other.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng_screen.h"
-#include "m4/riddle/riddle.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section2/room204.cpp b/engines/m4/riddle/rooms/section2/room204.cpp
index 8f52404466f..96cc8b086a8 100644
--- a/engines/m4/riddle/rooms/section2/room204.cpp
+++ b/engines/m4/riddle/rooms/section2/room204.cpp
@@ -21,11 +21,12 @@
#include "m4/riddle/rooms/section2/room204.h"
#include "m4/riddle/rooms/section2/section2.h"
+#include "m4/riddle/riddle.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng.h"
#include "m4/gui/gui_vmng_screen.h"
-#include "m4/riddle/riddle.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section2/room205.cpp b/engines/m4/riddle/rooms/section2/room205.cpp
index 681dcbe4886..dd102dcf108 100644
--- a/engines/m4/riddle/rooms/section2/room205.cpp
+++ b/engines/m4/riddle/rooms/section2/room205.cpp
@@ -20,12 +20,12 @@
*/
#include "m4/riddle/rooms/section2/room205.h"
-
-#include "m4/adv_r/other.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/inventory.h"
#include "m4/riddle/riddle.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/adv_r/other.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section2/room207.cpp b/engines/m4/riddle/rooms/section2/room207.cpp
index ab41fcf1f37..7b7b024ee7d 100644
--- a/engines/m4/riddle/rooms/section2/room207.cpp
+++ b/engines/m4/riddle/rooms/section2/room207.cpp
@@ -21,11 +21,11 @@
#include "m4/riddle/rooms/section2/room207.h"
#include "m4/riddle/rooms/section2/section2.h"
-
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/adv_file.h"
#include "m4/adv_r/other.h"
#include "m4/graphics/gr_series.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section2/room207.h b/engines/m4/riddle/rooms/section2/room207.h
index 760ff8e58f9..788f35c7bb6 100644
--- a/engines/m4/riddle/rooms/section2/room207.h
+++ b/engines/m4/riddle/rooms/section2/room207.h
@@ -22,6 +22,7 @@
#ifndef M4_RIDDLE_ROOMS_SECTION2_ROOM207_H
#define M4_RIDDLE_ROOMS_SECTION2_ROOM207_H
+#include "m4/adv_r/adv_trigger.h"
#include "m4/riddle/rooms/room.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section3/room301.cpp b/engines/m4/riddle/rooms/section3/room301.cpp
index ba5c9539922..9a6515a844b 100644
--- a/engines/m4/riddle/rooms/section3/room301.cpp
+++ b/engines/m4/riddle/rooms/section3/room301.cpp
@@ -20,10 +20,10 @@
*/
#include "m4/riddle/rooms/section3/room301.h"
-
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/other.h"
#include "m4/graphics/gr_series.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section3/room301.h b/engines/m4/riddle/rooms/section3/room301.h
index 81c07496db3..a053b3f46d0 100644
--- a/engines/m4/riddle/rooms/section3/room301.h
+++ b/engines/m4/riddle/rooms/section3/room301.h
@@ -23,6 +23,7 @@
#define M4_RIDDLE_ROOMS_SECTION3_ROOM301_H
#include "m4/riddle/rooms/room.h"
+#include "m4/adv_r/adv_trigger.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section3/room303.cpp b/engines/m4/riddle/rooms/section3/room303.cpp
index 9498724dd38..030e14ba41c 100644
--- a/engines/m4/riddle/rooms/section3/room303.cpp
+++ b/engines/m4/riddle/rooms/section3/room303.cpp
@@ -20,11 +20,12 @@
*/
#include "m4/riddle/rooms/section3/room303.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/adv_file.h"
#include "m4/fileio/extensions.h"
#include "m4/fileio/info.h"
+#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng.h"
#include "m4/gui/gui_sys.h"
#include "m4/platform/keys.h"
diff --git a/engines/m4/riddle/rooms/section3/room303.h b/engines/m4/riddle/rooms/section3/room303.h
index cbb15da1b8f..9a2ea0f928b 100644
--- a/engines/m4/riddle/rooms/section3/room303.h
+++ b/engines/m4/riddle/rooms/section3/room303.h
@@ -22,6 +22,7 @@
#ifndef M4_RIDDLE_ROOMS_SECTION3_ROOM303_H
#define M4_RIDDLE_ROOMS_SECTION3_ROOM303_H
+#include "m4/adv_r/adv_trigger.h"
#include "m4/riddle/rooms/room.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section3/room304.cpp b/engines/m4/riddle/rooms/section3/room304.cpp
index 58fead886c0..688fd89afae 100644
--- a/engines/m4/riddle/rooms/section3/room304.cpp
+++ b/engines/m4/riddle/rooms/section3/room304.cpp
@@ -19,15 +19,16 @@
*
*/
-#include "m4/graphics/gr_series.h"
-#include "m4/gui/gui_sys.h"
-#include "m4/platform/keys.h"
#include "m4/riddle/rooms/section3/room304.h"
-
-#include "m4/adv_r/other.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/adv_r/other.h"
+#include "m4/graphics/gr_series.h"
+#include "m4/gui/gui_sys.h"
+#include "m4/platform/keys.h"
+
namespace M4 {
namespace Riddle {
namespace Rooms {
diff --git a/engines/m4/riddle/rooms/section3/room305.cpp b/engines/m4/riddle/rooms/section3/room305.cpp
index 6716c23492d..3b5c69eac3b 100644
--- a/engines/m4/riddle/rooms/section3/room305.cpp
+++ b/engines/m4/riddle/rooms/section3/room305.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section3/room305.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/riddle.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section3/room305.h b/engines/m4/riddle/rooms/section3/room305.h
index 1c3b7203438..0b380cc96ae 100644
--- a/engines/m4/riddle/rooms/section3/room305.h
+++ b/engines/m4/riddle/rooms/section3/room305.h
@@ -22,6 +22,7 @@
#ifndef M4_RIDDLE_ROOMS_SECTION3_ROOM305_H
#define M4_RIDDLE_ROOMS_SECTION3_ROOM305_H
+#include "m4/adv_r/adv_trigger.h"
#include "m4/riddle/rooms/room.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section3/room309.cpp b/engines/m4/riddle/rooms/section3/room309.cpp
index 17056e1e285..329cb353943 100644
--- a/engines/m4/riddle/rooms/section3/room309.cpp
+++ b/engines/m4/riddle/rooms/section3/room309.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section3/room309.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section3/room352.cpp b/engines/m4/riddle/rooms/section3/room352.cpp
index ac24c3d6f5e..f0336b05814 100644
--- a/engines/m4/riddle/rooms/section3/room352.cpp
+++ b/engines/m4/riddle/rooms/section3/room352.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section3/room352.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_sys.h"
#include "m4/platform/keys.h"
diff --git a/engines/m4/riddle/rooms/section3/room354.cpp b/engines/m4/riddle/rooms/section3/room354.cpp
index fd3f550dc00..3a81859654c 100644
--- a/engines/m4/riddle/rooms/section3/room354.cpp
+++ b/engines/m4/riddle/rooms/section3/room354.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section3/room354.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_sys.h"
#include "m4/platform/keys.h"
diff --git a/engines/m4/riddle/rooms/section4/room401.cpp b/engines/m4/riddle/rooms/section4/room401.cpp
index 3a27fb196d1..73ff5b38161 100644
--- a/engines/m4/riddle/rooms/section4/room401.cpp
+++ b/engines/m4/riddle/rooms/section4/room401.cpp
@@ -22,6 +22,7 @@
#include "m4/riddle/rooms/section4/room401.h"
#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room402.cpp b/engines/m4/riddle/rooms/section4/room402.cpp
index ec341ba0210..737f57b7bfc 100644
--- a/engines/m4/riddle/rooms/section4/room402.cpp
+++ b/engines/m4/riddle/rooms/section4/room402.cpp
@@ -21,9 +21,10 @@
#include "m4/riddle/rooms/section4/room402.h"
#include "m4/riddle/rooms/section4/section4.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room403.cpp b/engines/m4/riddle/rooms/section4/room403.cpp
index 110aca1b782..59285935119 100644
--- a/engines/m4/riddle/rooms/section4/room403.cpp
+++ b/engines/m4/riddle/rooms/section4/room403.cpp
@@ -21,10 +21,11 @@
#include "m4/riddle/rooms/section4/room403.h"
#include "m4/riddle/rooms/section4/section4.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
-#include "m4/gui/gui_vmng.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
+#include "m4/gui/gui_vmng.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room404.cpp b/engines/m4/riddle/rooms/section4/room404.cpp
index b2634dc108a..77d7b6d4c9c 100644
--- a/engines/m4/riddle/rooms/section4/room404.cpp
+++ b/engines/m4/riddle/rooms/section4/room404.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section4/room404.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room405.cpp b/engines/m4/riddle/rooms/section4/room405.cpp
index 2f2431b4f86..66803308bc2 100644
--- a/engines/m4/riddle/rooms/section4/room405.cpp
+++ b/engines/m4/riddle/rooms/section4/room405.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section4/room405.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room406.cpp b/engines/m4/riddle/rooms/section4/room406.cpp
index e0aadad3127..e29d72e3138 100644
--- a/engines/m4/riddle/rooms/section4/room406.cpp
+++ b/engines/m4/riddle/rooms/section4/room406.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section4/room406.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room407.cpp b/engines/m4/riddle/rooms/section4/room407.cpp
index e3515234245..c63a686411f 100644
--- a/engines/m4/riddle/rooms/section4/room407.cpp
+++ b/engines/m4/riddle/rooms/section4/room407.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section4/room407.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room408.cpp b/engines/m4/riddle/rooms/section4/room408.cpp
index db8a3392155..f04d14be20f 100644
--- a/engines/m4/riddle/rooms/section4/room408.cpp
+++ b/engines/m4/riddle/rooms/section4/room408.cpp
@@ -21,9 +21,10 @@
#include "m4/riddle/rooms/section4/room408.h"
#include "m4/riddle/rooms/section4/section4.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room409.cpp b/engines/m4/riddle/rooms/section4/room409.cpp
index 850fc1b5e78..4ddd7141a04 100644
--- a/engines/m4/riddle/rooms/section4/room409.cpp
+++ b/engines/m4/riddle/rooms/section4/room409.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section4/room409.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room410.cpp b/engines/m4/riddle/rooms/section4/room410.cpp
index 370677c2280..e58003513f2 100644
--- a/engines/m4/riddle/rooms/section4/room410.cpp
+++ b/engines/m4/riddle/rooms/section4/room410.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section4/room410.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room413.cpp b/engines/m4/riddle/rooms/section4/room413.cpp
index cdeefa488c6..a87be2b1149 100644
--- a/engines/m4/riddle/rooms/section4/room413.cpp
+++ b/engines/m4/riddle/rooms/section4/room413.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section4/room413.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room456.cpp b/engines/m4/riddle/rooms/section4/room456.cpp
index 2a3cd76fa95..48ed232bacf 100644
--- a/engines/m4/riddle/rooms/section4/room456.cpp
+++ b/engines/m4/riddle/rooms/section4/room456.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section4/room456.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room493.cpp b/engines/m4/riddle/rooms/section4/room493.cpp
index d41222d2c7a..edc25bd0c19 100644
--- a/engines/m4/riddle/rooms/section4/room493.cpp
+++ b/engines/m4/riddle/rooms/section4/room493.cpp
@@ -20,10 +20,11 @@
*/
#include "m4/riddle/rooms/section4/room493.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_sys.h"
#include "m4/platform/keys.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room494.cpp b/engines/m4/riddle/rooms/section4/room494.cpp
index cbca80aa753..47ff93a6ef2 100644
--- a/engines/m4/riddle/rooms/section4/room494.cpp
+++ b/engines/m4/riddle/rooms/section4/room494.cpp
@@ -19,15 +19,15 @@
*
*/
-#include "m4/graphics/gr_series.h"
-#include "m4/gui/gui_sys.h"
-#include "m4/platform/keys.h"
#include "m4/riddle/rooms/section4/room494.h"
-
#include "m4/riddle/inventory.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/walker.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
+#include "m4/gui/gui_sys.h"
+#include "m4/platform/keys.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section4/room495.cpp b/engines/m4/riddle/rooms/section4/room495.cpp
index 10df10b1b4b..c482d6ce5cf 100644
--- a/engines/m4/riddle/rooms/section4/room495.cpp
+++ b/engines/m4/riddle/rooms/section4/room495.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section4/room495.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section5/room501.cpp b/engines/m4/riddle/rooms/section5/room501.cpp
index a0877ce6684..3c9700f151e 100644
--- a/engines/m4/riddle/rooms/section5/room501.cpp
+++ b/engines/m4/riddle/rooms/section5/room501.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section5/room501.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section5/room504.cpp b/engines/m4/riddle/rooms/section5/room504.cpp
index 78b158984b8..2ce6415205c 100644
--- a/engines/m4/riddle/rooms/section5/room504.cpp
+++ b/engines/m4/riddle/rooms/section5/room504.cpp
@@ -20,10 +20,11 @@
*/
#include "m4/riddle/rooms/section5/room504.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
-#include "m4/gui/gui_vmng.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/other.h"
+#include "m4/graphics/gr_series.h"
+#include "m4/gui/gui_vmng.h"
#include "m4/m4.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section5/room506.cpp b/engines/m4/riddle/rooms/section5/room506.cpp
index 6d3d66a63be..c8661eb5338 100644
--- a/engines/m4/riddle/rooms/section5/room506.cpp
+++ b/engines/m4/riddle/rooms/section5/room506.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section5/room506.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng_screen.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section5/room507.cpp b/engines/m4/riddle/rooms/section5/room507.cpp
index 0e2fb666957..ebf8a1e9dac 100644
--- a/engines/m4/riddle/rooms/section5/room507.cpp
+++ b/engines/m4/riddle/rooms/section5/room507.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section5/room507.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section5/room508.cpp b/engines/m4/riddle/rooms/section5/room508.cpp
index a3bb8f92eed..b4dea3320ae 100644
--- a/engines/m4/riddle/rooms/section5/room508.cpp
+++ b/engines/m4/riddle/rooms/section5/room508.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section5/room508.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/adv_file.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section5/room509.cpp b/engines/m4/riddle/rooms/section5/room509.cpp
index f8bca1b737e..7730f69871f 100644
--- a/engines/m4/riddle/rooms/section5/room509.cpp
+++ b/engines/m4/riddle/rooms/section5/room509.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section5/room509.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section5/room510.cpp b/engines/m4/riddle/rooms/section5/room510.cpp
index 656cd5ecdb7..ef0b62f0c43 100644
--- a/engines/m4/riddle/rooms/section5/room510.cpp
+++ b/engines/m4/riddle/rooms/section5/room510.cpp
@@ -20,11 +20,12 @@
*/
#include "m4/riddle/rooms/section5/room510.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/adv_file.h"
#include "m4/adv_r/other.h"
-#include "m4/riddle/riddle.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room603.cpp b/engines/m4/riddle/rooms/section6/room603.cpp
index b5df8856b4d..27864f10415 100644
--- a/engines/m4/riddle/rooms/section6/room603.cpp
+++ b/engines/m4/riddle/rooms/section6/room603.cpp
@@ -21,8 +21,9 @@
#include "m4/riddle/rooms/section6/room603.h"
#include "m4/riddle/rooms/section6/section6.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room604.cpp b/engines/m4/riddle/rooms/section6/room604.cpp
index f6e8ca90c15..8f3d7b944d0 100644
--- a/engines/m4/riddle/rooms/section6/room604.cpp
+++ b/engines/m4/riddle/rooms/section6/room604.cpp
@@ -20,10 +20,11 @@
*/
#include "m4/riddle/rooms/section6/room604.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/adv_file.h"
#include "m4/adv_r/other.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room605.cpp b/engines/m4/riddle/rooms/section6/room605.cpp
index 2a5b7d053bc..2ceb75d5356 100644
--- a/engines/m4/riddle/rooms/section6/room605.cpp
+++ b/engines/m4/riddle/rooms/section6/room605.cpp
@@ -21,10 +21,11 @@
#include "m4/riddle/rooms/section6/room605.h"
#include "m4/riddle/rooms/section6/section6.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
-#include "m4/adv_r/adv_file.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/adv_r/adv_file.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room607.cpp b/engines/m4/riddle/rooms/section6/room607.cpp
index 83990f647b0..a97d611a1dd 100644
--- a/engines/m4/riddle/rooms/section6/room607.cpp
+++ b/engines/m4/riddle/rooms/section6/room607.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section6/room607.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room608.cpp b/engines/m4/riddle/rooms/section6/room608.cpp
index f655e6207f9..a0e2fff76a5 100644
--- a/engines/m4/riddle/rooms/section6/room608.cpp
+++ b/engines/m4/riddle/rooms/section6/room608.cpp
@@ -21,9 +21,10 @@
#include "m4/riddle/rooms/section6/room608.h"
#include "m4/riddle/rooms/section6/section6.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/adv_file.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room610.cpp b/engines/m4/riddle/rooms/section6/room610.cpp
index d10abc8e1d0..a82bae977b8 100644
--- a/engines/m4/riddle/rooms/section6/room610.cpp
+++ b/engines/m4/riddle/rooms/section6/room610.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section6/room610.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
#include "m4/adv_r/other.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section6/room615.cpp b/engines/m4/riddle/rooms/section6/room615.cpp
index 8270f4016eb..ccacfd03df7 100644
--- a/engines/m4/riddle/rooms/section6/room615.cpp
+++ b/engines/m4/riddle/rooms/section6/room615.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section6/room615.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room620.cpp b/engines/m4/riddle/rooms/section6/room620.cpp
index 98ec11f60e6..58f0b8cab2a 100644
--- a/engines/m4/riddle/rooms/section6/room620.cpp
+++ b/engines/m4/riddle/rooms/section6/room620.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room620.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room621.cpp b/engines/m4/riddle/rooms/section6/room621.cpp
index a2c2221bb5b..c9c54a6d36d 100644
--- a/engines/m4/riddle/rooms/section6/room621.cpp
+++ b/engines/m4/riddle/rooms/section6/room621.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room621.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room622.cpp b/engines/m4/riddle/rooms/section6/room622.cpp
index eda647ace34..147e032c682 100644
--- a/engines/m4/riddle/rooms/section6/room622.cpp
+++ b/engines/m4/riddle/rooms/section6/room622.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room622.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room623.cpp b/engines/m4/riddle/rooms/section6/room623.cpp
index 65b2578816f..ee31fa423ee 100644
--- a/engines/m4/riddle/rooms/section6/room623.cpp
+++ b/engines/m4/riddle/rooms/section6/room623.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room623.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room624.cpp b/engines/m4/riddle/rooms/section6/room624.cpp
index bbf18fe03a2..5f238fab2a1 100644
--- a/engines/m4/riddle/rooms/section6/room624.cpp
+++ b/engines/m4/riddle/rooms/section6/room624.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room624.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room625.cpp b/engines/m4/riddle/rooms/section6/room625.cpp
index e733c3822d7..510205be713 100644
--- a/engines/m4/riddle/rooms/section6/room625.cpp
+++ b/engines/m4/riddle/rooms/section6/room625.cpp
@@ -22,6 +22,7 @@
#include "m4/riddle/rooms/section6/room625.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room626.cpp b/engines/m4/riddle/rooms/section6/room626.cpp
index d8b19ee66b3..710d4e78fe8 100644
--- a/engines/m4/riddle/rooms/section6/room626.cpp
+++ b/engines/m4/riddle/rooms/section6/room626.cpp
@@ -22,6 +22,7 @@
#include "m4/riddle/rooms/section6/room626.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room627.cpp b/engines/m4/riddle/rooms/section6/room627.cpp
index 88e1919f402..b8cab8a1b3e 100644
--- a/engines/m4/riddle/rooms/section6/room627.cpp
+++ b/engines/m4/riddle/rooms/section6/room627.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room627.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room628.cpp b/engines/m4/riddle/rooms/section6/room628.cpp
index 179f3f68ff5..c935436c0d4 100644
--- a/engines/m4/riddle/rooms/section6/room628.cpp
+++ b/engines/m4/riddle/rooms/section6/room628.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room628.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room629.cpp b/engines/m4/riddle/rooms/section6/room629.cpp
index afb36cc9f45..dd6003b4076 100644
--- a/engines/m4/riddle/rooms/section6/room629.cpp
+++ b/engines/m4/riddle/rooms/section6/room629.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room629.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room630.cpp b/engines/m4/riddle/rooms/section6/room630.cpp
index 5e2e9860e72..c6ad1c93975 100644
--- a/engines/m4/riddle/rooms/section6/room630.cpp
+++ b/engines/m4/riddle/rooms/section6/room630.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room630.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room631.cpp b/engines/m4/riddle/rooms/section6/room631.cpp
index 7e24be98007..374e3563190 100644
--- a/engines/m4/riddle/rooms/section6/room631.cpp
+++ b/engines/m4/riddle/rooms/section6/room631.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room631.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room632.cpp b/engines/m4/riddle/rooms/section6/room632.cpp
index 4383f3abe57..7562ea64e3f 100644
--- a/engines/m4/riddle/rooms/section6/room632.cpp
+++ b/engines/m4/riddle/rooms/section6/room632.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room632.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room633.cpp b/engines/m4/riddle/rooms/section6/room633.cpp
index 8f06a6e4801..5f09b691957 100644
--- a/engines/m4/riddle/rooms/section6/room633.cpp
+++ b/engines/m4/riddle/rooms/section6/room633.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room633.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room634.cpp b/engines/m4/riddle/rooms/section6/room634.cpp
index 71ddbd71420..1fb87f4f61f 100644
--- a/engines/m4/riddle/rooms/section6/room634.cpp
+++ b/engines/m4/riddle/rooms/section6/room634.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room634.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room635.cpp b/engines/m4/riddle/rooms/section6/room635.cpp
index 86fbf9a8e44..5ec48d00af8 100644
--- a/engines/m4/riddle/rooms/section6/room635.cpp
+++ b/engines/m4/riddle/rooms/section6/room635.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room635.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room636.cpp b/engines/m4/riddle/rooms/section6/room636.cpp
index f59585411c0..431efa76efa 100644
--- a/engines/m4/riddle/rooms/section6/room636.cpp
+++ b/engines/m4/riddle/rooms/section6/room636.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room636.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room637.cpp b/engines/m4/riddle/rooms/section6/room637.cpp
index 362ec34869f..ffd8b997c60 100644
--- a/engines/m4/riddle/rooms/section6/room637.cpp
+++ b/engines/m4/riddle/rooms/section6/room637.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room637.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room638.cpp b/engines/m4/riddle/rooms/section6/room638.cpp
index c8a16fdc739..43c2485b448 100644
--- a/engines/m4/riddle/rooms/section6/room638.cpp
+++ b/engines/m4/riddle/rooms/section6/room638.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room638.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room640.cpp b/engines/m4/riddle/rooms/section6/room640.cpp
index 571a061d211..2c44431fe5e 100644
--- a/engines/m4/riddle/rooms/section6/room640.cpp
+++ b/engines/m4/riddle/rooms/section6/room640.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room640.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room641.cpp b/engines/m4/riddle/rooms/section6/room641.cpp
index 7f13d1ab2df..73a0ade5e42 100644
--- a/engines/m4/riddle/rooms/section6/room641.cpp
+++ b/engines/m4/riddle/rooms/section6/room641.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room641.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room642.cpp b/engines/m4/riddle/rooms/section6/room642.cpp
index ad802a63026..39f85499c15 100644
--- a/engines/m4/riddle/rooms/section6/room642.cpp
+++ b/engines/m4/riddle/rooms/section6/room642.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room642.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room643.cpp b/engines/m4/riddle/rooms/section6/room643.cpp
index 680d7273e88..c909811288c 100644
--- a/engines/m4/riddle/rooms/section6/room643.cpp
+++ b/engines/m4/riddle/rooms/section6/room643.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room643.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room644.cpp b/engines/m4/riddle/rooms/section6/room644.cpp
index 159f48f8167..58a8e7950fa 100644
--- a/engines/m4/riddle/rooms/section6/room644.cpp
+++ b/engines/m4/riddle/rooms/section6/room644.cpp
@@ -22,6 +22,7 @@
#include "m4/riddle/rooms/section6/room644.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room645.cpp b/engines/m4/riddle/rooms/section6/room645.cpp
index 2e2995e1868..e6dea8374b1 100644
--- a/engines/m4/riddle/rooms/section6/room645.cpp
+++ b/engines/m4/riddle/rooms/section6/room645.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room645.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room646.cpp b/engines/m4/riddle/rooms/section6/room646.cpp
index 4a81c9202d9..350b45b53b4 100644
--- a/engines/m4/riddle/rooms/section6/room646.cpp
+++ b/engines/m4/riddle/rooms/section6/room646.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room646.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room647.cpp b/engines/m4/riddle/rooms/section6/room647.cpp
index b1b350fa224..ed9659fdfca 100644
--- a/engines/m4/riddle/rooms/section6/room647.cpp
+++ b/engines/m4/riddle/rooms/section6/room647.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room647.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room648.cpp b/engines/m4/riddle/rooms/section6/room648.cpp
index 65a442b4de2..1d5102f9b0b 100644
--- a/engines/m4/riddle/rooms/section6/room648.cpp
+++ b/engines/m4/riddle/rooms/section6/room648.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room648.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room650.cpp b/engines/m4/riddle/rooms/section6/room650.cpp
index 536080e12cd..a913c74d5b5 100644
--- a/engines/m4/riddle/rooms/section6/room650.cpp
+++ b/engines/m4/riddle/rooms/section6/room650.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/room650.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/room651.cpp b/engines/m4/riddle/rooms/section6/room651.cpp
index 319c729c24e..ddc8af56886 100644
--- a/engines/m4/riddle/rooms/section6/room651.cpp
+++ b/engines/m4/riddle/rooms/section6/room651.cpp
@@ -22,6 +22,7 @@
#include "m4/riddle/rooms/section6/room651.h"
#include "m4/riddle/vars.h"
#include "m4/riddle/riddle.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section6/section6_maze.cpp b/engines/m4/riddle/rooms/section6/section6_maze.cpp
index 6d701944a1c..62c0fa5daa0 100644
--- a/engines/m4/riddle/rooms/section6/section6_maze.cpp
+++ b/engines/m4/riddle/rooms/section6/section6_maze.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section6/section6_maze.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section7/room701.cpp b/engines/m4/riddle/rooms/section7/room701.cpp
index e873c4d33b2..afeee39d802 100644
--- a/engines/m4/riddle/rooms/section7/room701.cpp
+++ b/engines/m4/riddle/rooms/section7/room701.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section7/room701.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section7/room702.cpp b/engines/m4/riddle/rooms/section7/room702.cpp
index 7919b636a76..eb424947be2 100644
--- a/engines/m4/riddle/rooms/section7/room702.cpp
+++ b/engines/m4/riddle/rooms/section7/room702.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section7/room702.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section7/room703.cpp b/engines/m4/riddle/rooms/section7/room703.cpp
index 611d8fdc694..d0c5ae04893 100644
--- a/engines/m4/riddle/rooms/section7/room703.cpp
+++ b/engines/m4/riddle/rooms/section7/room703.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section7/room703.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng_screen.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section7/room704.cpp b/engines/m4/riddle/rooms/section7/room704.cpp
index ebea0f13ebd..e0fd26053cb 100644
--- a/engines/m4/riddle/rooms/section7/room704.cpp
+++ b/engines/m4/riddle/rooms/section7/room704.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section7/room704.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng_screen.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section7/room705.cpp b/engines/m4/riddle/rooms/section7/room705.cpp
index 51de207316c..edcdca97fc1 100644
--- a/engines/m4/riddle/rooms/section7/room705.cpp
+++ b/engines/m4/riddle/rooms/section7/room705.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section7/room705.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng_screen.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section7/room706.cpp b/engines/m4/riddle/rooms/section7/room706.cpp
index 8a6ded44885..d8a8779a045 100644
--- a/engines/m4/riddle/rooms/section7/room706.cpp
+++ b/engines/m4/riddle/rooms/section7/room706.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section7/room706.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng_screen.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section7/room707.cpp b/engines/m4/riddle/rooms/section7/room707.cpp
index 9243bc02e1a..0323a3f0547 100644
--- a/engines/m4/riddle/rooms/section7/room707.cpp
+++ b/engines/m4/riddle/rooms/section7/room707.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section7/room707.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng_screen.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section7/room709.cpp b/engines/m4/riddle/rooms/section7/room709.cpp
index d5f269b9a4c..82e717790c8 100644
--- a/engines/m4/riddle/rooms/section7/room709.cpp
+++ b/engines/m4/riddle/rooms/section7/room709.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section7/room709.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_sys.h"
-#include "m4/riddle/vars.h"
#include "m4/platform/keys.h"
#include "m4/platform/timer.h"
diff --git a/engines/m4/riddle/rooms/section7/room710.cpp b/engines/m4/riddle/rooms/section7/room710.cpp
index de0b3f3a3fb..f673c87e1ce 100644
--- a/engines/m4/riddle/rooms/section7/room710.cpp
+++ b/engines/m4/riddle/rooms/section7/room710.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section7/room710.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section7/room711.cpp b/engines/m4/riddle/rooms/section7/room711.cpp
index 813017283fc..90722a990f4 100644
--- a/engines/m4/riddle/rooms/section7/room711.cpp
+++ b/engines/m4/riddle/rooms/section7/room711.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section7/room711.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room801.cpp b/engines/m4/riddle/rooms/section8/room801.cpp
index 876600e9ef5..19c291bb8f4 100644
--- a/engines/m4/riddle/rooms/section8/room801.cpp
+++ b/engines/m4/riddle/rooms/section8/room801.cpp
@@ -21,8 +21,9 @@
#include "m4/riddle/rooms/section8/room801.h"
#include "m4/riddle/rooms/section8/section8.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room802.cpp b/engines/m4/riddle/rooms/section8/room802.cpp
index f7a94ed8541..244995fea0d 100644
--- a/engines/m4/riddle/rooms/section8/room802.cpp
+++ b/engines/m4/riddle/rooms/section8/room802.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section8/room802.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room803.cpp b/engines/m4/riddle/rooms/section8/room803.cpp
index 7316573eb58..06e59630f97 100644
--- a/engines/m4/riddle/rooms/section8/room803.cpp
+++ b/engines/m4/riddle/rooms/section8/room803.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section8/section8.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room804.cpp b/engines/m4/riddle/rooms/section8/room804.cpp
index 8668a1098ab..e4109bf81c4 100644
--- a/engines/m4/riddle/rooms/section8/room804.cpp
+++ b/engines/m4/riddle/rooms/section8/room804.cpp
@@ -20,11 +20,11 @@
*/
#include "m4/riddle/rooms/section8/room804.h"
-
#include "m4/riddle/riddle.h"
#include "m4/riddle/rooms/section8/section8.h"
#include "m4/riddle/rooms/section8/section8_room.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng.h"
diff --git a/engines/m4/riddle/rooms/section8/room805.cpp b/engines/m4/riddle/rooms/section8/room805.cpp
index 040cceafa69..6846c43a98a 100644
--- a/engines/m4/riddle/rooms/section8/room805.cpp
+++ b/engines/m4/riddle/rooms/section8/room805.cpp
@@ -20,11 +20,11 @@
*/
#include "m4/riddle/rooms/section8/room805.h"
-
-#include "m4/adv_r/adv_file.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/riddle.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/adv_r/adv_file.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room806.cpp b/engines/m4/riddle/rooms/section8/room806.cpp
index 55208c4f8e9..b4e3c6ba9c8 100644
--- a/engines/m4/riddle/rooms/section8/room806.cpp
+++ b/engines/m4/riddle/rooms/section8/room806.cpp
@@ -20,12 +20,12 @@
*/
#include "m4/riddle/rooms/section8/room806.h"
-
+#include "m4/riddle/riddle.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/adv_file.h"
#include "m4/adv_r/other.h"
#include "m4/graphics/gr_series.h"
-#include "m4/riddle/riddle.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room807.cpp b/engines/m4/riddle/rooms/section8/room807.cpp
index 251052b0f2b..67dff5111a9 100644
--- a/engines/m4/riddle/rooms/section8/room807.cpp
+++ b/engines/m4/riddle/rooms/section8/room807.cpp
@@ -20,11 +20,11 @@
*/
#include "m4/riddle/rooms/section8/room807.h"
-
-#include "m4/adv_r/other.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/riddle.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/adv_r/other.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room808.cpp b/engines/m4/riddle/rooms/section8/room808.cpp
index 5e8d5525564..4473a58e16b 100644
--- a/engines/m4/riddle/rooms/section8/room808.cpp
+++ b/engines/m4/riddle/rooms/section8/room808.cpp
@@ -22,11 +22,12 @@
#include "m4/riddle/rooms/section8/room808.h"
+#include "m4/riddle/riddle.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/adv_r/other.h"
#include "m4/core/errors.h"
#include "m4/graphics/gr_series.h"
-#include "m4/riddle/riddle.h"
-#include "m4/riddle/vars.h"
#include "m4/wscript/wst_regs.h"
namespace M4 {
diff --git a/engines/m4/riddle/rooms/section8/room809.cpp b/engines/m4/riddle/rooms/section8/room809.cpp
index b7cb78aa402..d64ac3aeb69 100644
--- a/engines/m4/riddle/rooms/section8/room809.cpp
+++ b/engines/m4/riddle/rooms/section8/room809.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section8/room809.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/riddle.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room810.cpp b/engines/m4/riddle/rooms/section8/room810.cpp
index 5f0dc7cb80c..fc1fa8730e5 100644
--- a/engines/m4/riddle/rooms/section8/room810.cpp
+++ b/engines/m4/riddle/rooms/section8/room810.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section8/room810.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room811.cpp b/engines/m4/riddle/rooms/section8/room811.cpp
index 337b108987a..63d0d8fb43d 100644
--- a/engines/m4/riddle/rooms/section8/room811.cpp
+++ b/engines/m4/riddle/rooms/section8/room811.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section8/room811.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room814.cpp b/engines/m4/riddle/rooms/section8/room814.cpp
index 7323d299d33..f2101819442 100644
--- a/engines/m4/riddle/rooms/section8/room814.cpp
+++ b/engines/m4/riddle/rooms/section8/room814.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section8/room814.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/riddle.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room818.cpp b/engines/m4/riddle/rooms/section8/room818.cpp
index f6fc9f39f5c..4d4efc21232 100644
--- a/engines/m4/riddle/rooms/section8/room818.cpp
+++ b/engines/m4/riddle/rooms/section8/room818.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section8/room818.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room824.cpp b/engines/m4/riddle/rooms/section8/room824.cpp
index 32972e40e5c..b6344c8f473 100644
--- a/engines/m4/riddle/rooms/section8/room824.cpp
+++ b/engines/m4/riddle/rooms/section8/room824.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section8/room824.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/riddle.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room834.cpp b/engines/m4/riddle/rooms/section8/room834.cpp
index dbcbb4ed2c4..5d7670775e4 100644
--- a/engines/m4/riddle/rooms/section8/room834.cpp
+++ b/engines/m4/riddle/rooms/section8/room834.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section8/room834.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/riddle.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room844.cpp b/engines/m4/riddle/rooms/section8/room844.cpp
index f0fec5b65d9..b20db5a7c42 100644
--- a/engines/m4/riddle/rooms/section8/room844.cpp
+++ b/engines/m4/riddle/rooms/section8/room844.cpp
@@ -20,9 +20,10 @@
*/
#include "m4/riddle/rooms/section8/room844.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/riddle.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room850.cpp b/engines/m4/riddle/rooms/section8/room850.cpp
index 1505194b374..4381c7228b0 100644
--- a/engines/m4/riddle/rooms/section8/room850.cpp
+++ b/engines/m4/riddle/rooms/section8/room850.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section8/room850.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room852.cpp b/engines/m4/riddle/rooms/section8/room852.cpp
index 8c1a98cc2ee..da8ec673128 100644
--- a/engines/m4/riddle/rooms/section8/room852.cpp
+++ b/engines/m4/riddle/rooms/section8/room852.cpp
@@ -20,6 +20,7 @@
*/
#include "m4/riddle/rooms/section8/room852.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
diff --git a/engines/m4/riddle/rooms/section8/room860.cpp b/engines/m4/riddle/rooms/section8/room860.cpp
index 74d0ac69a70..30840c6c5e5 100644
--- a/engines/m4/riddle/rooms/section8/room860.cpp
+++ b/engines/m4/riddle/rooms/section8/room860.cpp
@@ -19,11 +19,12 @@
*
*/
-#include "m4/m4.h"
#include "m4/riddle/rooms/section8/room860.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng_screen.h"
#include "m4/riddle/vars.h"
+#include "m4/m4.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/room861.cpp b/engines/m4/riddle/rooms/section8/room861.cpp
index 40168e5371d..b0ff104658b 100644
--- a/engines/m4/riddle/rooms/section8/room861.cpp
+++ b/engines/m4/riddle/rooms/section8/room861.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section8/room861.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section8/section8_room.cpp b/engines/m4/riddle/rooms/section8/section8_room.cpp
index 237147ae917..601e754d063 100644
--- a/engines/m4/riddle/rooms/section8/section8_room.cpp
+++ b/engines/m4/riddle/rooms/section8/section8_room.cpp
@@ -24,6 +24,7 @@
#include "m4/riddle/riddle.h"
#include "m4/riddle/rooms/section8/section8.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_vmng.h"
diff --git a/engines/m4/riddle/rooms/section9/room901.cpp b/engines/m4/riddle/rooms/section9/room901.cpp
index 51b6237dffd..136abbfa954 100644
--- a/engines/m4/riddle/rooms/section9/room901.cpp
+++ b/engines/m4/riddle/rooms/section9/room901.cpp
@@ -23,6 +23,7 @@
#include "m4/riddle/rooms/section9/room901.h"
#include "m4/riddle/hotkeys.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/gui/gui_sys.h"
#include "m4/platform/keys.h"
diff --git a/engines/m4/riddle/rooms/section9/room902.cpp b/engines/m4/riddle/rooms/section9/room902.cpp
index 923cc93f691..fa073ecfea5 100644
--- a/engines/m4/riddle/rooms/section9/room902.cpp
+++ b/engines/m4/riddle/rooms/section9/room902.cpp
@@ -21,6 +21,7 @@
#include "m4/riddle/rooms/section9/room902.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_sys.h"
#include "m4/platform/keys.h"
diff --git a/engines/m4/riddle/rooms/section9/room903.cpp b/engines/m4/riddle/rooms/section9/room903.cpp
index d3cf65e7469..577f28c12e4 100644
--- a/engines/m4/riddle/rooms/section9/room903.cpp
+++ b/engines/m4/riddle/rooms/section9/room903.cpp
@@ -19,12 +19,13 @@
*
*/
-#include "m4/m4.h"
#include "m4/riddle/rooms/section9/room903.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_sys.h"
#include "m4/platform/keys.h"
-#include "m4/riddle/vars.h"
+#include "m4/m4.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section9/room903.h b/engines/m4/riddle/rooms/section9/room903.h
index e85654e032c..167bb2633ac 100644
--- a/engines/m4/riddle/rooms/section9/room903.h
+++ b/engines/m4/riddle/rooms/section9/room903.h
@@ -23,6 +23,7 @@
#define M4_RIDDLE_ROOMS_SECTION9_ROOM903_H
#include "m4/core/rooms.h"
+#include "m4/wscript/ws_machine.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section9/room905.cpp b/engines/m4/riddle/rooms/section9/room905.cpp
index 1dfa2313b2b..74f330c8d0b 100644
--- a/engines/m4/riddle/rooms/section9/room905.cpp
+++ b/engines/m4/riddle/rooms/section9/room905.cpp
@@ -19,14 +19,15 @@
*
*/
-#include "m4/m4.h"
#include "m4/riddle/rooms/section9/room905.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_buffer.h"
#include "m4/gui/gui_sys.h"
#include "m4/gui/gui_vmng.h"
+#include "m4/m4.h"
#include "m4/platform/keys.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section9/room905.h b/engines/m4/riddle/rooms/section9/room905.h
index 8c11c796e7e..4266c9ec42f 100644
--- a/engines/m4/riddle/rooms/section9/room905.h
+++ b/engines/m4/riddle/rooms/section9/room905.h
@@ -23,6 +23,8 @@
#define M4_RIDDLE_ROOMS_SECTION9_ROOM905_H
#include "m4/core/rooms.h"
+#include "m4/graphics/gr_buff.h"
+#include "m4/wscript/ws_machine.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section9/room906.cpp b/engines/m4/riddle/rooms/section9/room906.cpp
index 801e39a6fb4..280dca4d9eb 100644
--- a/engines/m4/riddle/rooms/section9/room906.cpp
+++ b/engines/m4/riddle/rooms/section9/room906.cpp
@@ -20,10 +20,11 @@
*/
#include "m4/riddle/rooms/section9/room906.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_sys.h"
#include "m4/platform/keys.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section9/room907.cpp b/engines/m4/riddle/rooms/section9/room907.cpp
index b04ce32df45..0f379b4d3e1 100644
--- a/engines/m4/riddle/rooms/section9/room907.cpp
+++ b/engines/m4/riddle/rooms/section9/room907.cpp
@@ -20,10 +20,11 @@
*/
#include "m4/riddle/rooms/section9/room907.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_sys.h"
#include "m4/platform/keys.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section9/room908.cpp b/engines/m4/riddle/rooms/section9/room908.cpp
index 9d654adad8d..9844f1e98d3 100644
--- a/engines/m4/riddle/rooms/section9/room908.cpp
+++ b/engines/m4/riddle/rooms/section9/room908.cpp
@@ -20,10 +20,11 @@
*/
#include "m4/riddle/rooms/section9/room908.h"
+#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
#include "m4/graphics/gr_series.h"
#include "m4/gui/gui_sys.h"
#include "m4/platform/keys.h"
-#include "m4/riddle/vars.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section9/room917.cpp b/engines/m4/riddle/rooms/section9/room917.cpp
index dd177238309..6d577759b77 100644
--- a/engines/m4/riddle/rooms/section9/room917.cpp
+++ b/engines/m4/riddle/rooms/section9/room917.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section9/room917.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section9/room918.cpp b/engines/m4/riddle/rooms/section9/room918.cpp
index 6ab5b50380d..d1eb41b8151 100644
--- a/engines/m4/riddle/rooms/section9/room918.cpp
+++ b/engines/m4/riddle/rooms/section9/room918.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section9/room918.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/riddle/rooms/section9/room996.cpp b/engines/m4/riddle/rooms/section9/room996.cpp
index bb46d51a337..c53a61a2f54 100644
--- a/engines/m4/riddle/rooms/section9/room996.cpp
+++ b/engines/m4/riddle/rooms/section9/room996.cpp
@@ -20,8 +20,9 @@
*/
#include "m4/riddle/rooms/section9/room996.h"
-#include "m4/graphics/gr_series.h"
#include "m4/riddle/vars.h"
+#include "m4/adv_r/adv_control.h"
+#include "m4/graphics/gr_series.h"
namespace M4 {
namespace Riddle {
diff --git a/engines/m4/vars.cpp b/engines/m4/vars.cpp
index 856d65c5080..29c4c5f2da1 100644
--- a/engines/m4/vars.cpp
+++ b/engines/m4/vars.cpp
@@ -21,6 +21,8 @@
#include "common/debug.h"
#include "m4/vars.h"
+
+#include "core/imath.h"
#include "m4/adv_r/adv.h"
#include "m4/adv_r/adv_been.h"
#include "m4/core/errors.h"
More information about the Scummvm-git-logs
mailing list