[Scummvm-git-logs] scummvm master -> 38f359f882d1f663cf2a1b797d41cdfe40e71469

bluegr noreply at scummvm.org
Wed Sep 3 08:57:25 UTC 2025 

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:
38f359f882 DRAGONS: Clean up and reorganize includes


Commit: 38f359f882d1f663cf2a1b797d41cdfe40e71469
    https://github.com/scummvm/scummvm/commit/38f359f882d1f663cf2a1b797d41cdfe40e71469
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-09-03T11:57:22+03:00

Commit Message:
DRAGONS: Clean up and reorganize includes

This avoids the inclusion of large system headers in all files (e.g.
system.h), and fixes compilation with MSVC, which would not compile
this engine without enabling language extensions, as system headers
were included in the wrong order

Changed paths:
    engines/dragons/actor.cpp
    engines/dragons/actor.h
    engines/dragons/actorresource.h
    engines/dragons/credits.cpp
    engines/dragons/cursor.h
    engines/dragons/cutscene.h
    engines/dragons/dragonflg.h
    engines/dragons/dragonimg.h
    engines/dragons/dragonini.h
    engines/dragons/dragonobd.h
    engines/dragons/dragonrms.h
    engines/dragons/dragons.cpp
    engines/dragons/dragons.h
    engines/dragons/dragonvar.h
    engines/dragons/font.h
    engines/dragons/inventory.h
    engines/dragons/metaengine.cpp
    engines/dragons/midimusicplayer.h
    engines/dragons/minigame1.h
    engines/dragons/minigame2.cpp
    engines/dragons/minigame2.h
    engines/dragons/minigame4.cpp
    engines/dragons/minigame4.h
    engines/dragons/minigame5.cpp
    engines/dragons/minigame5.h
    engines/dragons/sound.h
    engines/dragons/strplayer.cpp


diff --git a/engines/dragons/actor.cpp b/engines/dragons/actor.cpp
index 664d25ae4ef..d350134a3d7 100644
--- a/engines/dragons/actor.cpp
+++ b/engines/dragons/actor.cpp
@@ -18,11 +18,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "common/debug.h"
+#include "dragons/actor.h"
+#include "dragons/actorresource.h"
 #include "dragons/dragons.h"
 #include "dragons/dragonini.h"
-#include "dragons/actorresource.h"
-#include "dragons/actor.h"
 #include "dragons/scene.h"
 #include "dragons/screen.h"
 
diff --git a/engines/dragons/actor.h b/engines/dragons/actor.h
index 73c4b141cca..47d8bfabfcd 100644
--- a/engines/dragons/actor.h
+++ b/engines/dragons/actor.h
@@ -21,7 +21,9 @@
 #ifndef DRAGONS_ACTOR_H
 #define DRAGONS_ACTOR_H
 
-#include "common/system.h"
+#include "common/array.h"
+#include "common/scummsys.h"
+#include "graphics/surface.h"
 
 namespace Dragons {
 class Actor;
diff --git a/engines/dragons/actorresource.h b/engines/dragons/actorresource.h
index c352a7169b4..347bea34d79 100644
--- a/engines/dragons/actorresource.h
+++ b/engines/dragons/actorresource.h
@@ -21,7 +21,9 @@
 #ifndef DRAGONS_ACTORRESOURCE_H
 #define DRAGONS_ACTORRESOURCE_H
 
-#include "common/system.h"
+#include "common/scummsys.h"
+#include "graphics/surface.h"
+#include "common/stream.h"
 
 namespace Dragons {
 
diff --git a/engines/dragons/credits.cpp b/engines/dragons/credits.cpp
index 9d7f5e4c4d6..22f4747e341 100644
--- a/engines/dragons/credits.cpp
+++ b/engines/dragons/credits.cpp
@@ -18,9 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "dragons/credits.h"
 
-#include "common/system.h"
+#include "dragons/credits.h"
 #include "dragons/bigfile.h"
 #include "dragons/dragons.h"
 #include "dragons/screen.h"
diff --git a/engines/dragons/cursor.h b/engines/dragons/cursor.h
index 481319afc89..5d1b239d809 100644
--- a/engines/dragons/cursor.h
+++ b/engines/dragons/cursor.h
@@ -21,7 +21,6 @@
 #ifndef DRAGONS_CURSOR_H
 #define DRAGONS_CURSOR_H
 
-#include "common/system.h"
 #include "dragons/scriptopcodes.h"
 
 namespace Dragons {
diff --git a/engines/dragons/cutscene.h b/engines/dragons/cutscene.h
index abfa40a80af..facc9f404a9 100644
--- a/engines/dragons/cutscene.h
+++ b/engines/dragons/cutscene.h
@@ -21,7 +21,7 @@
 #ifndef DRAGONS_CUTSCENE_H
 #define DRAGONS_CUTSCENE_H
 
-#include "common/system.h"
+#include "common/scummsys.h"
 
 namespace Dragons {
 
diff --git a/engines/dragons/dragonflg.h b/engines/dragons/dragonflg.h
index f51c2780eef..3d7f5a3042e 100644
--- a/engines/dragons/dragonflg.h
+++ b/engines/dragons/dragonflg.h
@@ -22,7 +22,6 @@
 #define DRAGONS_DRAGONFLG_H
 
 #include "common/stream.h"
-#include "common/system.h"
 
 namespace Dragons {
 
diff --git a/engines/dragons/dragonimg.h b/engines/dragons/dragonimg.h
index fe7ef90d1b9..b0b0e96495f 100644
--- a/engines/dragons/dragonimg.h
+++ b/engines/dragons/dragonimg.h
@@ -21,8 +21,6 @@
 #ifndef DRAGONS_DRAGONImg_H
 #define DRAGONS_DRAGONImg_H
 
-#include "common/system.h"
-
 namespace Dragons {
 
 struct Img {
diff --git a/engines/dragons/dragonini.h b/engines/dragons/dragonini.h
index 6e54f6ff49c..a9ba97ad4a6 100644
--- a/engines/dragons/dragonini.h
+++ b/engines/dragons/dragonini.h
@@ -21,7 +21,6 @@
 #ifndef DRAGONS_DRAGONINI_H
 #define DRAGONS_DRAGONINI_H
 
-#include "common/system.h"
 #include "dragons/bigfile.h"
 
 namespace Dragons {
diff --git a/engines/dragons/dragonobd.h b/engines/dragons/dragonobd.h
index dede72e391c..04b8fb3bd93 100644
--- a/engines/dragons/dragonobd.h
+++ b/engines/dragons/dragonobd.h
@@ -21,8 +21,6 @@
 #ifndef DRAGONS_DRAGONOBD_H
 #define DRAGONS_DRAGONOBD_H
 
-#include "common/system.h"
-
 namespace Dragons {
 
 class BigfileArchive;
diff --git a/engines/dragons/dragonrms.h b/engines/dragons/dragonrms.h
index f476db1ad8a..3260bb434e2 100644
--- a/engines/dragons/dragonrms.h
+++ b/engines/dragons/dragonrms.h
@@ -21,8 +21,6 @@
 #ifndef DRAGONS_DRAGONRMS_H
 #define DRAGONS_DRAGONRMS_H
 
-#include "common/system.h"
-
 namespace Dragons {
 
 struct RMS {
diff --git a/engines/dragons/dragons.cpp b/engines/dragons/dragons.cpp
index 52fb3d74a91..6b4b83b1c89 100644
--- a/engines/dragons/dragons.cpp
+++ b/engines/dragons/dragons.cpp
@@ -18,14 +18,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "gui/message.h"
 #include "common/config-manager.h"
 #include "common/keyboard.h"
 #include "common/language.h"
 #include "common/translation.h"
+#include "common/error.h"
+#include "common/events.h"
+#include "common/scummsys.h"
+#include "common/system.h"
 #include "engines/util.h"
 #include "graphics/thumbnail.h"
-#include "common/error.h"
+#include "gui/message.h"
 #include "dragons/actor.h"
 #include "dragons/actorresource.h"
 #include "dragons/background.h"
diff --git a/engines/dragons/dragons.h b/engines/dragons/dragons.h
index 61a6362860c..38bd23e2999 100644
--- a/engines/dragons/dragons.h
+++ b/engines/dragons/dragons.h
@@ -21,10 +21,9 @@
 #ifndef DRAGONS_DRAGONS_H
 #define DRAGONS_DRAGONS_H
 
-#include "gui/EventRecorder.h"
 #include "engines/engine.h"
-#include "dragons/specialopcodes.h"
 #include "dragons/detection.h"
+#include "common/rect.h"
 
 namespace Dragons {
 
diff --git a/engines/dragons/dragonvar.h b/engines/dragons/dragonvar.h
index b8e6b9f5123..8f64d0f8b88 100644
--- a/engines/dragons/dragonvar.h
+++ b/engines/dragons/dragonvar.h
@@ -21,7 +21,7 @@
 #ifndef DRAGONS_DRAGONVAR_H
 #define DRAGONS_DRAGONVAR_H
 
-#include "common/system.h"
+#include "common/scummsys.h"
 
 namespace Dragons {
 
diff --git a/engines/dragons/font.h b/engines/dragons/font.h
index c72d2ff7d4a..2128745a662 100644
--- a/engines/dragons/font.h
+++ b/engines/dragons/font.h
@@ -24,7 +24,6 @@
 #include "common/scummsys.h"
 #include "common/stream.h"
 #include "graphics/surface.h"
-#include "common/rect.h"
 
 namespace Dragons {
 
diff --git a/engines/dragons/inventory.h b/engines/dragons/inventory.h
index 9eb6417d623..fa47ee495f1 100644
--- a/engines/dragons/inventory.h
+++ b/engines/dragons/inventory.h
@@ -22,8 +22,6 @@
 #ifndef DRAGONS_INVENTORY_H
 #define DRAGONS_INVENTORY_H
 
-#include "common/system.h"
-
 namespace Dragons {
 
 class Actor;
diff --git a/engines/dragons/metaengine.cpp b/engines/dragons/metaengine.cpp
index dd6158d7e30..59745a85f4a 100644
--- a/engines/dragons/metaengine.cpp
+++ b/engines/dragons/metaengine.cpp
@@ -28,7 +28,6 @@
 #include "backends/keymapper/keymapper.h"
 #include "backends/keymapper/standard-actions.h"
 #include "base/plugins.h"
-#include "graphics/thumbnail.h"
 
 class DragonsMetaEngine : public AdvancedMetaEngine<Dragons::DragonsGameDescription> {
 public:
diff --git a/engines/dragons/midimusicplayer.h b/engines/dragons/midimusicplayer.h
index 060886d3679..d519fe50ae7 100644
--- a/engines/dragons/midimusicplayer.h
+++ b/engines/dragons/midimusicplayer.h
@@ -22,8 +22,8 @@
 #define DRAGONS_MIDIMUSICPLAYER_H
 
 #include "audio/midiplayer.h"
-#include "vabsound.h"
-#include "bigfile.h"
+#include "dragons/vabsound.h"
+#include "dragons/bigfile.h"
 
 namespace Dragons {
 
diff --git a/engines/dragons/minigame1.h b/engines/dragons/minigame1.h
index 25ae4cb1986..8aca2ee23c1 100644
--- a/engines/dragons/minigame1.h
+++ b/engines/dragons/minigame1.h
@@ -21,8 +21,6 @@
 #ifndef DRAGONS_MINIGAME1_H
 #define DRAGONS_MINIGAME1_H
 
-#include "common/system.h"
-
 namespace Dragons {
 
 class DragonsEngine;
diff --git a/engines/dragons/minigame2.cpp b/engines/dragons/minigame2.cpp
index ff07bcf48ad..82c359bcbca 100644
--- a/engines/dragons/minigame2.cpp
+++ b/engines/dragons/minigame2.cpp
@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include "common/scummsys.h"
 #include "dragons/minigame2.h"
 #include "dragons/actor.h"
 #include "dragons/actorresource.h"
diff --git a/engines/dragons/minigame2.h b/engines/dragons/minigame2.h
index e343f4e1f92..4ce94c15265 100644
--- a/engines/dragons/minigame2.h
+++ b/engines/dragons/minigame2.h
@@ -21,8 +21,6 @@
 #ifndef DRAGONS_MINIGAME2_H
 #define DRAGONS_MINIGAME2_H
 
-#include "common/system.h"
-
 namespace Dragons {
 
 class DragonsEngine;
diff --git a/engines/dragons/minigame4.cpp b/engines/dragons/minigame4.cpp
index fd8911cf3e2..d0022ffca3d 100644
--- a/engines/dragons/minigame4.cpp
+++ b/engines/dragons/minigame4.cpp
@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include "common/scummsys.h"
 #include "dragons/minigame4.h"
 #include "dragons/actor.h"
 #include "dragons/dragons.h"
diff --git a/engines/dragons/minigame4.h b/engines/dragons/minigame4.h
index 4db13139930..d4b259d9c89 100644
--- a/engines/dragons/minigame4.h
+++ b/engines/dragons/minigame4.h
@@ -21,8 +21,6 @@
 #ifndef DRAGONS_MINIGAME4_H
 #define DRAGONS_MINIGAME4_H
 
-#include "common/system.h"
-
 namespace Dragons {
 
 class DragonsEngine;
diff --git a/engines/dragons/minigame5.cpp b/engines/dragons/minigame5.cpp
index e40fbb6a8d0..ac763598200 100644
--- a/engines/dragons/minigame5.cpp
+++ b/engines/dragons/minigame5.cpp
@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include "common/scummsys.h"
 #include "dragons/minigame5.h"
 #include "dragons/actor.h"
 #include "dragons/dragons.h"
diff --git a/engines/dragons/minigame5.h b/engines/dragons/minigame5.h
index 43b2981076a..6ddf410f3cf 100644
--- a/engines/dragons/minigame5.h
+++ b/engines/dragons/minigame5.h
@@ -21,8 +21,6 @@
 #ifndef DRAGONS_MINIGAME5_H
 #define DRAGONS_MINIGAME5_H
 
-#include "common/system.h"
-
 namespace Dragons {
 
 class DragonsEngine;
diff --git a/engines/dragons/sound.h b/engines/dragons/sound.h
index 8c87b95c844..6725c6d2598 100644
--- a/engines/dragons/sound.h
+++ b/engines/dragons/sound.h
@@ -24,7 +24,7 @@
 #include "common/scummsys.h"
 #include "audio/mixer.h"
 #include "audio/audiostream.h"
-#include "midimusicplayer.h"
+#include "dragons/midimusicplayer.h"
 
 
 namespace Dragons {
diff --git a/engines/dragons/strplayer.cpp b/engines/dragons/strplayer.cpp
index 6d6432efb78..eb22aa1b452 100644
--- a/engines/dragons/strplayer.cpp
+++ b/engines/dragons/strplayer.cpp
@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#include "common/events.h"
 #include "video/psx_decoder.h"
 #include "dragons/dragons.h"
 #include "dragons/screen.h"

More information about the Scummvm-git-logs mailing list