diff options
37 files changed, 216 insertions, 212 deletions
diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp index 271af524e6..7d696a3fe3 100644 --- a/engines/dm/champion.cpp +++ b/engines/dm/champion.cpp @@ -25,18 +25,18 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "champion.h" -#include "dungeonman.h" -#include "eventman.h" -#include "menus.h" -#include "inventory.h" -#include "objectman.h" -#include "text.h" -#include "timeline.h" -#include "projexpl.h" -#include "group.h" -#include "movesens.h" -#include "sounds.h" +#include "dm/champion.h" +#include "dm/dungeonman.h" +#include "dm/eventman.h" +#include "dm/menus.h" +#include "dm/inventory.h" +#include "dm/objectman.h" +#include "dm/text.h" +#include "dm/timeline.h" +#include "dm/projexpl.h" +#include "dm/group.h" +#include "dm/movesens.h" +#include "dm/sounds.h" namespace DM { diff --git a/engines/dm/champion.h b/engines/dm/champion.h index 88fbfcfcb8..36fbd4e99f 100644 --- a/engines/dm/champion.h +++ b/engines/dm/champion.h @@ -30,8 +30,8 @@ #include "common/str.h" -#include "dm.h" -#include "gfx.h" +#include "dm/dm.h" +#include "dm/gfx.h" namespace DM { diff --git a/engines/dm/console.cpp b/engines/dm/console.cpp index a8157003d6..1ccfe39fc1 100644 --- a/engines/dm/console.cpp +++ b/engines/dm/console.cpp @@ -25,12 +25,12 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "console.h" -#include "dm.h" -#include "champion.h" -#include "dungeonman.h" -#include "movesens.h" -#include "objectman.h" +#include "dm/console.h" +#include "dm/dm.h" +#include "dm/champion.h" +#include "dm/dungeonman.h" +#include "dm/movesens.h" +#include "dm/objectman.h" namespace DM { diff --git a/engines/dm/detection.cpp b/engines/dm/detection.cpp index 548bab899d..ad711c51e9 100644 --- a/engines/dm/detection.cpp +++ b/engines/dm/detection.cpp @@ -25,14 +25,15 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "dm/dm.h" #include "common/config-manager.h" #include "common/error.h" #include "common/fs.h" +#include "common/system.h" #include "engines/advancedDetector.h" -#include <common/system.h> + +#include "dm/dm.h" namespace DM { static const PlainGameDescriptor DMGames[] = { diff --git a/engines/dm/dialog.cpp b/engines/dm/dialog.cpp index c6b317c927..dd2e15836c 100644 --- a/engines/dm/dialog.cpp +++ b/engines/dm/dialog.cpp @@ -25,11 +25,10 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "dialog.h" -#include "gfx.h" -#include "text.h" -#include "eventman.h" - +#include "dm/dialog.h" +#include "dm/gfx.h" +#include "dm/text.h" +#include "dm/eventman.h" namespace DM { diff --git a/engines/dm/dialog.h b/engines/dm/dialog.h index 647ae8dd3e..bf6618a264 100644 --- a/engines/dm/dialog.h +++ b/engines/dm/dialog.h @@ -25,8 +25,7 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "dm.h" - +#include "dm/dm.h" namespace DM { diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp index 0bb227a06f..538124f087 100644 --- a/engines/dm/dm.cpp +++ b/engines/dm/dm.cpp @@ -25,6 +25,8 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ +#include "advancedDetector.h" + #include "common/config-manager.h" #include "common/scummsys.h" #include "common/system.h" @@ -33,35 +35,37 @@ #include "common/debug-channels.h" #include "common/error.h" -#include "engines/util.h" -#include "engines/engine.h" -#include "graphics/palette.h" #include "common/file.h" #include "common/events.h" #include "common/array.h" #include "common/algorithm.h" +#include "common/translation.h" + +#include "engines/util.h" +#include "engines/engine.h" + +#include "graphics/cursorman.h" +#include "graphics/palette.h" +#include "graphics/surface.h" + +#include "gui/saveload.h" #include "dm/dm.h" -#include "gfx.h" -#include "dungeonman.h" -#include "eventman.h" -#include "menus.h" -#include "champion.h" -#include "loadsave.h" -#include "objectman.h" -#include "inventory.h" -#include "text.h" -#include "movesens.h" -#include "group.h" -#include "timeline.h" -#include "projexpl.h" -#include "dialog.h" -#include <graphics/cursorman.h> -#include <advancedDetector.h> -#include "sounds.h" -#include <graphics/surface.h> -#include <common/translation.h> -#include <gui/saveload.h> +#include "dm/gfx.h" +#include "dm/dungeonman.h" +#include "dm/eventman.h" +#include "dm/menus.h" +#include "dm/champion.h" +#include "dm/loadsave.h" +#include "dm/objectman.h" +#include "dm/inventory.h" +#include "dm/text.h" +#include "dm/movesens.h" +#include "dm/group.h" +#include "dm/timeline.h" +#include "dm/projexpl.h" +#include "dm/dialog.h" +#include "dm/sounds.h" namespace DM { const char *debugGetDirectionName(Direction dir) { diff --git a/engines/dm/dm.h b/engines/dm/dm.h index 083dfad1c3..979301d412 100644 --- a/engines/dm/dm.h +++ b/engines/dm/dm.h @@ -28,16 +28,17 @@ #ifndef DM_H #define DM_H -#include "common/random.h" #include "engines/engine.h" +#include "engines/savestate.h" + +#include "common/random.h" #include "common/savefile.h" #include "common/str.h" -#include "engines/savestate.h" +#include "common/memstream.h" -#include "console.h" -#include <common/memstream.h> -#include <advancedDetector.h> +#include "advancedDetector.h" +#include "dm/console.h" struct ADGameDescription; diff --git a/engines/dm/dmglobals.cpp b/engines/dm/dmglobals.cpp index 02e819dff4..993f112b02 100644 --- a/engines/dm/dmglobals.cpp +++ b/engines/dm/dmglobals.cpp @@ -26,18 +26,18 @@ */ #include "common/system.h" + #include "dm/dm.h" -#include "gfx.h" -#include "dungeonman.h" -#include "eventman.h" -#include "menus.h" -#include "champion.h" -#include "loadsave.h" -#include "objectman.h" -#include "inventory.h" -#include "text.h" -#include "movesens.h" -#include "string.h" +#include "dm/gfx.h" +#include "dm/dungeonman.h" +#include "dm/eventman.h" +#include "dm/menus.h" +#include "dm/champion.h" +#include "dm/loadsave.h" +#include "dm/objectman.h" +#include "dm/inventory.h" +#include "dm/text.h" +#include "dm/movesens.h" namespace DM { diff --git a/engines/dm/dungeonman.cpp b/engines/dm/dungeonman.cpp index f41ccf2f19..67f0ac730e 100644 --- a/engines/dm/dungeonman.cpp +++ b/engines/dm/dungeonman.cpp @@ -28,12 +28,12 @@ #include "common/file.h" #include "common/memstream.h" -#include "dungeonman.h" -#include "timeline.h" -#include "champion.h" -#include "group.h" -#include "movesens.h" -#include "projexpl.h" +#include "dm/dungeonman.h" +#include "dm/timeline.h" +#include "dm/champion.h" +#include "dm/group.h" +#include "dm/movesens.h" +#include "dm/projexpl.h" namespace DM { diff --git a/engines/dm/dungeonman.h b/engines/dm/dungeonman.h index ac85b28be0..450cd7faf8 100644 --- a/engines/dm/dungeonman.h +++ b/engines/dm/dungeonman.h @@ -28,8 +28,8 @@ #ifndef DUNGEONMAN_H #define DUNGEONMAN_H -#include "dm.h" -#include "gfx.h" +#include "dm/dm.h" +#include "dm/gfx.h" namespace DM { diff --git a/engines/dm/eventman.cpp b/engines/dm/eventman.cpp index 01f6567b18..5d9c04b95c 100644 --- a/engines/dm/eventman.cpp +++ b/engines/dm/eventman.cpp @@ -27,20 +27,20 @@ #include "common/system.h" #include "graphics/cursorman.h" - -#include "eventman.h" -#include "dungeonman.h" -#include "movesens.h" -#include "objectman.h" -#include "inventory.h" -#include "menus.h" -#include "timeline.h" -#include "projexpl.h" -#include "text.h" -#include "group.h" -#include "dialog.h" -#include "sounds.h" -#include <mortevielle/saveload.h> +#include "graphics/thumbnail.h" + +#include "dm/eventman.h" +#include "dm/dungeonman.h" +#include "dm/movesens.h" +#include "dm/objectman.h" +#include "dm/inventory.h" +#include "dm/menus.h" +#include "dm/timeline.h" +#include "dm/projexpl.h" +#include "dm/text.h" +#include "dm/group.h" +#include "dm/dialog.h" +#include "dm/sounds.h" namespace DM { diff --git a/engines/dm/eventman.h b/engines/dm/eventman.h index 92d055cb46..649bc393b5 100644 --- a/engines/dm/eventman.h +++ b/engines/dm/eventman.h @@ -32,9 +32,9 @@ #include "common/queue.h" #include "common/array.h" -#include "dm.h" -#include "gfx.h" -#include "champion.h" +#include "dm/dm.h" +#include "dm/gfx.h" +#include "dm/champion.h" namespace DM { diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp index 3163b8c454..0b5fa47656 100644 --- a/engines/dm/gfx.cpp +++ b/engines/dm/gfx.cpp @@ -28,17 +28,17 @@ #include "engines/util.h" #include "common/system.h" #include "common/file.h" -#include "graphics/palette.h" #include "common/endian.h" +#include "graphics/palette.h" -#include "gfx.h" -#include "dungeonman.h" -#include "group.h" -#include "timeline.h" -#include "champion.h" -#include "eventman.h" -#include "lzw.h" -#include "text.h" +#include "dm/gfx.h" +#include "dm/dungeonman.h" +#include "dm/group.h" +#include "dm/timeline.h" +#include "dm/champion.h" +#include "dm/eventman.h" +#include "dm/lzw.h" +#include "dm/text.h" namespace DM { DisplayMan::DisplayMan(DMEngine *dmEngine) : _vm(dmEngine) { diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h index 44e75abbc2..f3e6a5d5da 100644 --- a/engines/dm/gfx.h +++ b/engines/dm/gfx.h @@ -31,9 +31,10 @@ #include "common/scummsys.h" #include "common/rect.h" #include "common/memstream.h" -#include "dm.h" #include "common/array.h" +#include "dm/dm.h" + namespace DM { #define k0_viewFloor_D3L 0 // @ C0_VIEW_FLOOR_D3L diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp index 901661fb64..09581f72ae 100644 --- a/engines/dm/group.cpp +++ b/engines/dm/group.cpp @@ -25,15 +25,15 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "group.h" -#include "dungeonman.h" -#include "champion.h" -#include "movesens.h" -#include "projexpl.h" -#include "timeline.h" -#include "objectman.h" -#include "menus.h" -#include "sounds.h" +#include "dm/group.h" +#include "dm/dungeonman.h" +#include "dm/champion.h" +#include "dm/movesens.h" +#include "dm/projexpl.h" +#include "dm/timeline.h" +#include "dm/objectman.h" +#include "dm/menus.h" +#include "dm/sounds.h" namespace DM { diff --git a/engines/dm/group.h b/engines/dm/group.h index 02f6927b8c..38c3a0d207 100644 --- a/engines/dm/group.h +++ b/engines/dm/group.h @@ -28,7 +28,7 @@ #ifndef DM_GROUP_H #define DM_GROUP_H -#include "dm.h" +#include "dm/dm.h" namespace DM { class Champion; diff --git a/engines/dm/inventory.cpp b/engines/dm/inventory.cpp index 85bf916661..516bc467dc 100644 --- a/engines/dm/inventory.cpp +++ b/engines/dm/inventory.cpp @@ -25,19 +25,19 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include <graphics/surface.h> +#include "graphics/surface.h" #include "graphics/thumbnail.h" -#include "inventory.h" -#include "dungeonman.h" -#include "eventman.h" -#include "menus.h" -#include "gfx.h" -#include "text.h" -#include "objectman.h" -#include "timeline.h" -#include "projexpl.h" -#include "sounds.h" +#include "dm/inventory.h" +#include "dm/dungeonman.h" +#include "dm/eventman.h" +#include "dm/menus.h" +#include "dm/gfx.h" +#include "dm/text.h" +#include "dm/objectman.h" +#include "dm/timeline.h" +#include "dm/projexpl.h" +#include "dm/sounds.h" namespace DM { diff --git a/engines/dm/inventory.h b/engines/dm/inventory.h index 795d287485..e5bc490c44 100644 --- a/engines/dm/inventory.h +++ b/engines/dm/inventory.h @@ -25,12 +25,10 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "dm.h" -#include "gfx.h" -#include "champion.h" -#include "dungeonman.h" - - +#include "dm/dm.h" +#include "dm/gfx.h" +#include "dm/champion.h" +#include "dm/dungeonman.h" namespace DM { diff --git a/engines/dm/loadsave.cpp b/engines/dm/loadsave.cpp index 0fde80581a..a9ee6f8d0a 100644 --- a/engines/dm/loadsave.cpp +++ b/engines/dm/loadsave.cpp @@ -26,19 +26,19 @@ */ #include "common/system.h" #include "common/savefile.h" +#include "common/translation.h" #include "graphics/thumbnail.h" - -#include "dm.h" -#include "dungeonman.h" -#include "timeline.h" -#include "group.h" -#include "champion.h" -#include "menus.h" -#include "eventman.h" -#include "projexpl.h" -#include "dialog.h" -#include <gui/saveload.h> -#include <common/translation.h> +#include "gui/saveload.h" + +#include "dm/dm.h" +#include "dm/dungeonman.h" +#include "dm/timeline.h" +#include "dm/group.h" +#include "dm/champion.h" +#include "dm/menus.h" +#include "dm/eventman.h" +#include "dm/projexpl.h" +#include "dm/dialog.h" namespace DM { diff --git a/engines/dm/loadsave.h b/engines/dm/loadsave.h index a224966ff5..ca8f4d6369 100644 --- a/engines/dm/loadsave.h +++ b/engines/dm/loadsave.h @@ -28,7 +28,7 @@ #ifndef DM_LOADSAVE_H #define DM_LOADSAVE_H -#include "dm.h" +#include "dm/dm.h" namespace DM { diff --git a/engines/dm/lzw.cpp b/engines/dm/lzw.cpp index 63b60c5cb8..a93b0c875a 100644 --- a/engines/dm/lzw.cpp +++ b/engines/dm/lzw.cpp @@ -25,8 +25,9 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "lzw.h" -#include <common/memstream.h> +#include "common/memstream.h" + +#include "dm/lzw.h" namespace DM { diff --git a/engines/dm/lzw.h b/engines/dm/lzw.h index a83f1add57..b476c11cd8 100644 --- a/engines/dm/lzw.h +++ b/engines/dm/lzw.h @@ -25,9 +25,9 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include <common/file.h> +#include "common/file.h" -#include "dm.h" +#include "dm/dm.h" namespace Common { class MemoryReadStream; diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp index 2c56382c6a..32d6c62565 100644 --- a/engines/dm/menus.cpp +++ b/engines/dm/menus.cpp @@ -25,19 +25,19 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "menus.h" -#include "gfx.h" -#include "champion.h" -#include "dungeonman.h" -#include "objectman.h" -#include "inventory.h" -#include "text.h" -#include "eventman.h" -#include "timeline.h" -#include "movesens.h" -#include "group.h" -#include "projexpl.h" -#include "sounds.h" +#include "dm/menus.h" +#include "dm/gfx.h" +#include "dm/champion.h" +#include "dm/dungeonman.h" +#include "dm/objectman.h" +#include "dm/inventory.h" +#include "dm/text.h" +#include "dm/eventman.h" +#include "dm/timeline.h" +#include "dm/movesens.h" +#include "dm/group.h" +#include "dm/projexpl.h" +#include "dm/sounds.h" namespace DM { diff --git a/engines/dm/menus.h b/engines/dm/menus.h index 77455fb607..1d37651bf8 100644 --- a/engines/dm/menus.h +++ b/engines/dm/menus.h @@ -28,9 +28,9 @@ #ifndef DM_MENUS_H #define DM_MENUS_H -#include "dm.h" -#include "champion.h" -#include "dungeonman.h" +#include "dm/dm.h" +#include "dm/champion.h" +#include "dm/dungeonman.h" namespace DM { diff --git a/engines/dm/movesens.cpp b/engines/dm/movesens.cpp index c437e1ccc8..308c9e6467 100644 --- a/engines/dm/movesens.cpp +++ b/engines/dm/movesens.cpp @@ -26,16 +26,16 @@ */ -#include "movesens.h" -#include "champion.h" -#include "inventory.h" -#include "dungeonman.h" -#include "objectman.h" -#include "timeline.h" -#include "group.h" -#include "projexpl.h" -#include "text.h" -#include "sounds.h" +#include "dm/movesens.h" +#include "dm/champion.h" +#include "dm/inventory.h" +#include "dm/dungeonman.h" +#include "dm/objectman.h" +#include "dm/timeline.h" +#include "dm/group.h" +#include "dm/projexpl.h" +#include "dm/text.h" +#include "dm/sounds.h" namespace DM { diff --git a/engines/dm/movesens.h b/engines/dm/movesens.h index c9381fab9f..ce023bc5c1 100644 --- a/engines/dm/movesens.h +++ b/engines/dm/movesens.h @@ -29,7 +29,7 @@ #ifndef DM_MOVESENS_H #define DM_MOVESENS_H -#include "dm.h" +#include "dm/dm.h" namespace DM { class Sensor; diff --git a/engines/dm/objectman.cpp b/engines/dm/objectman.cpp index c191fa5225..48efb969fe 100644 --- a/engines/dm/objectman.cpp +++ b/engines/dm/objectman.cpp @@ -25,9 +25,9 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "objectman.h" -#include "dungeonman.h" -#include "text.h" +#include "dm/objectman.h" +#include "dm/dungeonman.h" +#include "dm/text.h" namespace DM { diff --git a/engines/dm/objectman.h b/engines/dm/objectman.h index 4478babfa1..6c128eaa82 100644 --- a/engines/dm/objectman.h +++ b/engines/dm/objectman.h @@ -25,8 +25,8 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "dm.h" -#include "champion.h" +#include "dm/dm.h" +#include "dm/champion.h" namespace DM { diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp index 99fda6706d..aade217853 100644 --- a/engines/dm/projexpl.cpp +++ b/engines/dm/projexpl.cpp @@ -26,13 +26,13 @@ */ -#include "projexpl.h" -#include "dungeonman.h" -#include "timeline.h" -#include "group.h" -#include "objectman.h" -#include "movesens.h" -#include "sounds.h" +#include "dm/projexpl.h" +#include "dm/dungeonman.h" +#include "dm/timeline.h" +#include "dm/group.h" +#include "dm/objectman.h" +#include "dm/movesens.h" +#include "dm/sounds.h" namespace DM { diff --git a/engines/dm/projexpl.h b/engines/dm/projexpl.h index 1621e3137d..e8db0bf8d3 100644 --- a/engines/dm/projexpl.h +++ b/engines/dm/projexpl.h @@ -27,7 +27,7 @@ #ifndef DM_PROJEXPL_H #define DM_PROJEXPL_H -#include "dm.h" +#include "dm/dm.h" namespace DM { diff --git a/engines/dm/sounds.cpp b/engines/dm/sounds.cpp index 421c299a15..9affc78d4d 100644 --- a/engines/dm/sounds.cpp +++ b/engines/dm/sounds.cpp @@ -27,14 +27,14 @@ #include "audio/audiostream.h" #include "audio/decoders/raw.h" -#include <advancedDetector.h> - -#include "dm.h" -#include "gfx.h" -#include <audio/mixer.h> -#include "timeline.h" -#include "dungeonman.h" -#include "sounds.h" +#include "audio/mixer.h" +#include "advancedDetector.h" + +#include "dm/dm.h" +#include "dm/gfx.h" +#include "dm/timeline.h" +#include "dm/dungeonman.h" +#include "dm/sounds.h" namespace DM { diff --git a/engines/dm/sounds.h b/engines/dm/sounds.h index e449274730..1d0996372c 100644 --- a/engines/dm/sounds.h +++ b/engines/dm/sounds.h @@ -25,7 +25,7 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "dm.h" +#include "dm/dm.h" namespace DM { diff --git a/engines/dm/text.cpp b/engines/dm/text.cpp index 80a115cb5b..16955bacd8 100644 --- a/engines/dm/text.cpp +++ b/engines/dm/text.cpp @@ -25,9 +25,9 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "text.h" -#include <common/system.h> +#include "common/system.h" +#include "dm/text.h" namespace DM { diff --git a/engines/dm/text.h b/engines/dm/text.h index d157c9bbeb..2124834fdb 100644 --- a/engines/dm/text.h +++ b/engines/dm/text.h @@ -28,8 +28,8 @@ #ifndef DM_TEXT_H #define DM_TEXT_H -#include "dm.h" -#include "gfx.h" +#include "dm/dm.h" +#include "dm/gfx.h" namespace DM { diff --git a/engines/dm/timeline.cpp b/engines/dm/timeline.cpp index 98987dc635..b4c70bbc88 100644 --- a/engines/dm/timeline.cpp +++ b/engines/dm/timeline.cpp @@ -25,17 +25,17 @@ * maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/) */ -#include "timeline.h" -#include "dungeonman.h" -#include "champion.h" -#include "inventory.h" -#include "group.h" -#include "projexpl.h" -#include "movesens.h" -#include "text.h" -#include "eventman.h" -#include "objectman.h" -#include "sounds.h" +#include "dm/timeline.h" +#include "dm/dungeonman.h" +#include "dm/champion.h" +#include "dm/inventory.h" +#include "dm/group.h" +#include "dm/projexpl.h" +#include "dm/movesens.h" +#include "dm/text.h" +#include "dm/eventman.h" +#include "dm/objectman.h" +#include "dm/sounds.h" namespace DM { diff --git a/engines/dm/timeline.h b/engines/dm/timeline.h index d3c63fdc6f..1c0f51a8c7 100644 --- a/engines/dm/timeline.h +++ b/engines/dm/timeline.h @@ -28,7 +28,7 @@ #ifndef DM_TIMELINE_H #define DM_TIMELINE_H -#include "dm.h" +#include "dm/dm.h" namespace DM { class Champion; |