diff options
Diffstat (limited to 'engines/mohawk')
36 files changed, 76 insertions, 19 deletions
diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp index a6ec2cf85a..05284f8b2b 100644 --- a/engines/mohawk/bitmap.cpp +++ b/engines/mohawk/bitmap.cpp @@ -31,6 +31,7 @@ #include "common/memstream.h" #include "common/substream.h" #include "common/system.h" +#include "common/textconsole.h" namespace Mohawk { diff --git a/engines/mohawk/console.cpp b/engines/mohawk/console.cpp index ee67c9f23c..56d4a97554 100644 --- a/engines/mohawk/console.cpp +++ b/engines/mohawk/console.cpp @@ -29,6 +29,8 @@ #include "mohawk/sound.h" #include "mohawk/video.h" +#include "common/system.h" + #ifdef ENABLE_CSTIME #include "mohawk/cstime.h" #endif diff --git a/engines/mohawk/cstime.cpp b/engines/mohawk/cstime.cpp index 955e0e5af6..46faae08f5 100644 --- a/engines/mohawk/cstime.cpp +++ b/engines/mohawk/cstime.cpp @@ -30,15 +30,14 @@ #include "mohawk/cstime_view.h" #include "mohawk/resource.h" #include "mohawk/cursors.h" -#include "mohawk/sound.h" #include "mohawk/video.h" #include "common/config-manager.h" +#include "common/error.h" #include "common/events.h" #include "common/EventRecorder.h" #include "common/fs.h" - -#include "engines/util.h" +#include "common/textconsole.h" namespace Mohawk { diff --git a/engines/mohawk/cstime_cases.cpp b/engines/mohawk/cstime_cases.cpp index 408f1c9d9a..c4801f822c 100644 --- a/engines/mohawk/cstime_cases.cpp +++ b/engines/mohawk/cstime_cases.cpp @@ -26,6 +26,8 @@ #include "mohawk/cstime_cases.h" #include "mohawk/cstime_ui.h" +#include "common/textconsole.h" + namespace Mohawk { CSTimeCase1::CSTimeCase1(MohawkEngine_CSTime *vm) : CSTimeCase(vm, 1) { diff --git a/engines/mohawk/cstime_game.cpp b/engines/mohawk/cstime_game.cpp index 14e5d99e51..66dce1da92 100644 --- a/engines/mohawk/cstime_game.cpp +++ b/engines/mohawk/cstime_game.cpp @@ -29,6 +29,8 @@ #include "mohawk/resource.h" #include "mohawk/sound.h" #include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" namespace Mohawk { diff --git a/engines/mohawk/cstime_ui.cpp b/engines/mohawk/cstime_ui.cpp index 935b0321da..106f7ea319 100644 --- a/engines/mohawk/cstime_ui.cpp +++ b/engines/mohawk/cstime_ui.cpp @@ -29,6 +29,8 @@ #include "mohawk/resource.h" #include "common/algorithm.h" // find #include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" #include "graphics/fontman.h" namespace Mohawk { diff --git a/engines/mohawk/cstime_view.cpp b/engines/mohawk/cstime_view.cpp index 115b363b6e..12d641a9ff 100644 --- a/engines/mohawk/cstime_view.cpp +++ b/engines/mohawk/cstime_view.cpp @@ -30,6 +30,8 @@ #include "mohawk/cursors.h" #include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" namespace Mohawk { diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp index 80f4c0f702..cd64cc9048 100644 --- a/engines/mohawk/detection.cpp +++ b/engines/mohawk/detection.cpp @@ -26,9 +26,8 @@ #include "base/plugins.h" #include "engines/advancedDetector.h" -#include "common/config-manager.h" -#include "common/file.h" #include "common/savefile.h" +#include "common/system.h" #include "mohawk/livingbooks.h" diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp index c5a0c7e86d..4c7e52f02f 100644 --- a/engines/mohawk/dialogs.cpp +++ b/engines/mohawk/dialogs.cpp @@ -27,7 +27,9 @@ #include "mohawk/dialogs.h" #include "gui/gui-manager.h" -#include "common/savefile.h" +#include "gui/ThemeEngine.h" +#include "gui/widget.h" +#include "common/system.h" #include "common/translation.h" #ifdef ENABLE_MYST diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp index 81d2b6f019..54dc85b8ff 100644 --- a/engines/mohawk/graphics.cpp +++ b/engines/mohawk/graphics.cpp @@ -28,7 +28,9 @@ #include "mohawk/livingbooks.h" #include "common/substream.h" +#include "common/system.h" #include "engines/util.h" +#include "graphics/palette.h" #include "graphics/primitives.h" #include "gui/message.h" diff --git a/engines/mohawk/installer_archive.cpp b/engines/mohawk/installer_archive.cpp index 4ea742dff6..5079375896 100644 --- a/engines/mohawk/installer_archive.cpp +++ b/engines/mohawk/installer_archive.cpp @@ -27,8 +27,6 @@ #include "common/dcl.h" #include "common/debug.h" -#include "common/substream.h" -#include "common/util.h" namespace Mohawk { diff --git a/engines/mohawk/installer_archive.h b/engines/mohawk/installer_archive.h index 565b363be3..d33fbe5bcd 100644 --- a/engines/mohawk/installer_archive.h +++ b/engines/mohawk/installer_archive.h @@ -27,6 +27,8 @@ #include "common/scummsys.h" #include "common/endian.h" #include "common/file.h" +#include "common/hash-str.h" +#include "common/hashmap.h" #include "common/str.h" #ifndef MOHAWK_INSTALLER_ARCHIVE_H diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp index 22ea8d07a1..2475965812 100644 --- a/engines/mohawk/livingbooks.cpp +++ b/engines/mohawk/livingbooks.cpp @@ -26,13 +26,17 @@ #include "mohawk/livingbooks.h" #include "mohawk/resource.h" #include "mohawk/cursors.h" -#include "mohawk/sound.h" #include "mohawk/video.h" +#include "common/config-manager.h" +#include "common/error.h" #include "common/events.h" #include "common/EventRecorder.h" #include "common/fs.h" #include "common/archive.h" +#include "common/textconsole.h" + +#include "graphics/palette.h" #include "engines/util.h" diff --git a/engines/mohawk/livingbooks_code.cpp b/engines/mohawk/livingbooks_code.cpp index 84f69af2ac..4237c712d9 100644 --- a/engines/mohawk/livingbooks_code.cpp +++ b/engines/mohawk/livingbooks_code.cpp @@ -26,6 +26,9 @@ #include "mohawk/livingbooks.h" #include "mohawk/resource.h" +#include "common/system.h" +#include "common/textconsole.h" + namespace Mohawk { bool LBValue::operator==(const LBValue &x) const { diff --git a/engines/mohawk/mohawk.cpp b/engines/mohawk/mohawk.cpp index 015cbffb26..f63645f1ac 100644 --- a/engines/mohawk/mohawk.cpp +++ b/engines/mohawk/mohawk.cpp @@ -24,13 +24,9 @@ */ #include "common/scummsys.h" -#include "common/config-manager.h" -#include "common/file.h" -#include "common/events.h" -#include "common/keyboard.h" - -#include "base/plugins.h" -#include "base/version.h" +#include "common/error.h" +#include "common/system.h" +#include "common/textconsole.h" #include "mohawk/mohawk.h" #include "mohawk/cursors.h" diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 1aba820fed..655a38b578 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -25,7 +25,9 @@ #include "common/config-manager.h" #include "common/debug-channels.h" +#include "common/system.h" #include "common/translation.h" +#include "common/textconsole.h" #include "mohawk/cursors.h" #include "mohawk/graphics.h" diff --git a/engines/mohawk/myst_areas.cpp b/engines/mohawk/myst_areas.cpp index 21f6627f60..dc00bff923 100644 --- a/engines/mohawk/myst_areas.cpp +++ b/engines/mohawk/myst_areas.cpp @@ -29,6 +29,10 @@ #include "mohawk/sound.h" #include "mohawk/video.h" +#include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" + namespace Mohawk { MystResource::MystResource(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent) { diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index 17a2c66091..71c408ed37 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -31,6 +31,8 @@ #include "mohawk/sound.h" #include "mohawk/video.h" +#include "common/system.h" +#include "common/textconsole.h" #include "gui/message.h" namespace Mohawk { diff --git a/engines/mohawk/myst_stacks/channelwood.cpp b/engines/mohawk/myst_stacks/channelwood.cpp index 26267cfbda..cba2583a50 100644 --- a/engines/mohawk/myst_stacks/channelwood.cpp +++ b/engines/mohawk/myst_stacks/channelwood.cpp @@ -32,7 +32,9 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/channelwood.h" -#include "gui/message.h" +#include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/credits.cpp b/engines/mohawk/myst_stacks/credits.cpp index 61772eda4d..bb8397fd09 100644 --- a/engines/mohawk/myst_stacks/credits.cpp +++ b/engines/mohawk/myst_stacks/credits.cpp @@ -30,6 +30,7 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/credits.h" +#include "common/system.h" #include "gui/message.h" namespace Mohawk { diff --git a/engines/mohawk/myst_stacks/dni.cpp b/engines/mohawk/myst_stacks/dni.cpp index ffbf9c991f..e2a11eb94f 100644 --- a/engines/mohawk/myst_stacks/dni.cpp +++ b/engines/mohawk/myst_stacks/dni.cpp @@ -31,6 +31,8 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/dni.h" +#include "common/system.h" + namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/mechanical.cpp b/engines/mohawk/myst_stacks/mechanical.cpp index 3dab2f7939..c5c11026f5 100644 --- a/engines/mohawk/myst_stacks/mechanical.cpp +++ b/engines/mohawk/myst_stacks/mechanical.cpp @@ -32,7 +32,8 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/mechanical.h" -#include "gui/message.h" +#include "common/events.h" +#include "common/system.h" namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp index 5d070322ca..2b8ef94442 100644 --- a/engines/mohawk/myst_stacks/myst.cpp +++ b/engines/mohawk/myst_stacks/myst.cpp @@ -33,6 +33,8 @@ #include "mohawk/myst_stacks/myst.h" #include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" #include "gui/message.h" diff --git a/engines/mohawk/myst_stacks/preview.cpp b/engines/mohawk/myst_stacks/preview.cpp index dc491c7573..fddf6290fb 100644 --- a/engines/mohawk/myst_stacks/preview.cpp +++ b/engines/mohawk/myst_stacks/preview.cpp @@ -30,6 +30,7 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/preview.h" +#include "common/system.h" #include "gui/message.h" namespace Mohawk { diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp index a84cd0632d..c670cb6a48 100644 --- a/engines/mohawk/myst_stacks/selenitic.cpp +++ b/engines/mohawk/myst_stacks/selenitic.cpp @@ -32,6 +32,8 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/selenitic.h" +#include "common/system.h" +#include "common/textconsole.h" #include "gui/message.h" namespace Mohawk { diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp index e664081c96..4057edd9c9 100644 --- a/engines/mohawk/myst_stacks/slides.cpp +++ b/engines/mohawk/myst_stacks/slides.cpp @@ -30,6 +30,7 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/slides.h" +#include "common/system.h" #include "gui/message.h" namespace Mohawk { diff --git a/engines/mohawk/myst_stacks/stoneship.cpp b/engines/mohawk/myst_stacks/stoneship.cpp index b5b403dad8..07701c273e 100644 --- a/engines/mohawk/myst_stacks/stoneship.cpp +++ b/engines/mohawk/myst_stacks/stoneship.cpp @@ -32,7 +32,9 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/stoneship.h" -#include "gui/message.h" +#include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_state.cpp b/engines/mohawk/myst_state.cpp index 968bb422be..de71dcf382 100644 --- a/engines/mohawk/myst_state.cpp +++ b/engines/mohawk/myst_state.cpp @@ -27,7 +27,9 @@ #include "mohawk/myst.h" #include "mohawk/myst_state.h" +#include "common/debug.h" #include "common/serializer.h" +#include "common/textconsole.h" #include "common/util.h" namespace Mohawk { diff --git a/engines/mohawk/resource.cpp b/engines/mohawk/resource.cpp index de1513b237..62250b75f2 100644 --- a/engines/mohawk/resource.cpp +++ b/engines/mohawk/resource.cpp @@ -28,6 +28,7 @@ #include "common/debug.h" #include "common/substream.h" #include "common/util.h" +#include "common/textconsole.h" namespace Mohawk { diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h index 88927884a2..3aba5643db 100644 --- a/engines/mohawk/riven.h +++ b/engines/mohawk/riven.h @@ -35,6 +35,7 @@ #include "common/hashmap.h" #include "common/hash-str.h" #include "common/random.h" +#include "common/rect.h" namespace Mohawk { diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp index 7c453dec48..dc0d66f19b 100644 --- a/engines/mohawk/riven_external.cpp +++ b/engines/mohawk/riven_external.cpp @@ -32,6 +32,7 @@ #include "gui/message.h" #include "common/events.h" +#include "common/system.h" namespace Mohawk { diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp index 35f38c4069..b8f86f993a 100644 --- a/engines/mohawk/riven_scripts.cpp +++ b/engines/mohawk/riven_scripts.cpp @@ -33,6 +33,7 @@ #include "common/memstream.h" #include "common/stream.h" +#include "common/system.h" namespace Mohawk { diff --git a/engines/mohawk/riven_scripts.h b/engines/mohawk/riven_scripts.h index 46cd965f40..2ac805c366 100644 --- a/engines/mohawk/riven_scripts.h +++ b/engines/mohawk/riven_scripts.h @@ -28,6 +28,7 @@ #include "common/str-array.h" #include "common/ptr.h" +#include "common/textconsole.h" class MohawkEngine_Riven; diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp index 9759f14699..fba87808d2 100644 --- a/engines/mohawk/sound.cpp +++ b/engines/mohawk/sound.cpp @@ -25,7 +25,10 @@ #include "mohawk/sound.h" +#include "common/debug.h" +#include "common/system.h" #include "common/util.h" +#include "common/textconsole.h" #include "audio/musicplugin.h" #include "audio/audiostream.h" diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp index f481b5ceb2..36b94558a7 100644 --- a/engines/mohawk/video.cpp +++ b/engines/mohawk/video.cpp @@ -27,9 +27,16 @@ #include "mohawk/resource.h" #include "mohawk/video.h" +#include "common/debug.h" #include "common/events.h" +#include "common/textconsole.h" +#include "common/system.h" + +#include "graphics/surface.h" + #include "video/qt_decoder.h" + namespace Mohawk { void VideoEntry::clear() { diff --git a/engines/mohawk/view.cpp b/engines/mohawk/view.cpp index 837d386b58..e5a44122ea 100644 --- a/engines/mohawk/view.cpp +++ b/engines/mohawk/view.cpp @@ -28,6 +28,8 @@ #include "mohawk/graphics.h" #include "common/stream.h" #include "common/system.h" +#include "common/textconsole.h" +#include "graphics/palette.h" namespace Mohawk { |