diff options
64 files changed, 78 insertions, 225 deletions
diff --git a/engines/kyra/animator_hof.cpp b/engines/kyra/animator_hof.cpp index aa39ae6355..a563bc2b4f 100644 --- a/engines/kyra/animator_hof.cpp +++ b/engines/kyra/animator_hof.cpp @@ -26,7 +26,6 @@ #include "kyra/kyra_hof.h" #include "kyra/wsamovie.h" -#include "common/endian.h" #include "common/system.h" namespace Kyra { diff --git a/engines/kyra/animator_lok.cpp b/engines/kyra/animator_lok.cpp index 3f09362c5e..452d5e8062 100644 --- a/engines/kyra/animator_lok.cpp +++ b/engines/kyra/animator_lok.cpp @@ -23,17 +23,13 @@ * */ -#include "common/endian.h" -#include "common/error.h" -#include "common/rect.h" -#include "common/util.h" - #include "kyra/kyra_lok.h" #include "kyra/screen.h" #include "kyra/animator_lok.h" #include "kyra/sprites.h" namespace Kyra { + Animator_LoK::Animator_LoK(KyraEngine_LoK *vm, OSystem *system) { _vm = vm; _screen = vm->screen(); diff --git a/engines/kyra/animator_tim.cpp b/engines/kyra/animator_tim.cpp index 0290b2aa7f..fa42042bef 100644 --- a/engines/kyra/animator_tim.cpp +++ b/engines/kyra/animator_tim.cpp @@ -23,9 +23,6 @@ * */ -#include "common/endian.h" -#include "common/system.h" - #include "kyra/script_tim.h" #include "kyra/wsamovie.h" #include "kyra/screen_lol.h" @@ -36,6 +33,8 @@ #include "kyra/screen_v2.h" #endif +#include "common/system.h" + namespace Kyra { #ifdef ENABLE_LOL diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp index 301271ad3c..066648b96f 100644 --- a/engines/kyra/debugger.cpp +++ b/engines/kyra/debugger.cpp @@ -23,18 +23,15 @@ * */ - -#include "common/config-manager.h" -#include "common/system.h" #include "kyra/debugger.h" #include "kyra/kyra_lok.h" -#include "kyra/kyra_v2.h" #include "kyra/kyra_hof.h" -#include "kyra/screen.h" #include "kyra/timer.h" #include "kyra/resource.h" #include "kyra/lol.h" +#include "common/system.h" + namespace Kyra { Debugger::Debugger(KyraEngine_v1 *vm) diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index 34d1834e0b..87cda9f3b6 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -22,13 +22,11 @@ * $Id$ */ -#include "kyra/kyra_v1.h" #include "kyra/kyra_lok.h" #include "kyra/lol.h" #include "kyra/kyra_hof.h" #include "kyra/kyra_mr.h" - #include "common/config-manager.h" #include "common/system.h" #include "common/savefile.h" diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index 8c1a8ab141..849b65a24b 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -25,7 +25,6 @@ #include "kyra/gui.h" -#include "kyra/screen.h" #include "kyra/text.h" #include "kyra/wsamovie.h" diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp index 1a289807fa..3f7e22b780 100644 --- a/engines/kyra/gui_hof.cpp +++ b/engines/kyra/gui_hof.cpp @@ -23,12 +23,9 @@ * */ -#include "kyra/kyra_v1.h" +#include "kyra/gui_hof.h" #include "kyra/kyra_hof.h" -#include "kyra/screen.h" -#include "kyra/wsamovie.h" #include "kyra/timer.h" -#include "kyra/sound.h" #include "kyra/resource.h" #include "common/system.h" diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp index a4bec82f84..c31cbe3db2 100644 --- a/engines/kyra/gui_lok.cpp +++ b/engines/kyra/gui_lok.cpp @@ -23,16 +23,12 @@ * */ +#include "kyra/gui_lok.h" #include "kyra/kyra_lok.h" -#include "kyra/screen.h" -#include "kyra/script.h" -#include "kyra/text.h" #include "kyra/animator_lok.h" -#include "kyra/sound.h" -#include "kyra/gui_lok.h" +#include "kyra/text.h" #include "kyra/timer.h" #include "kyra/util.h" -#include "kyra/item.h" #include "common/savefile.h" #include "common/system.h" diff --git a/engines/kyra/gui_lok.h b/engines/kyra/gui_lok.h index e846933741..084a798de4 100644 --- a/engines/kyra/gui_lok.h +++ b/engines/kyra/gui_lok.h @@ -27,6 +27,7 @@ #define KYRA_GUI_LOK_H #include "kyra/gui.h" +#include "kyra/screen_lok.h" namespace Kyra { diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp index f52dd32c20..95934deee5 100644 --- a/engines/kyra/gui_lol.cpp +++ b/engines/kyra/gui_lol.cpp @@ -25,9 +25,9 @@ #ifdef ENABLE_LOL +#include "kyra/gui_lol.h" #include "kyra/lol.h" #include "kyra/screen_lol.h" -#include "kyra/gui_lol.h" #include "kyra/resource.h" #include "kyra/util.h" diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp index b34ff6a554..539bf38779 100644 --- a/engines/kyra/gui_mr.cpp +++ b/engines/kyra/gui_mr.cpp @@ -26,9 +26,7 @@ #include "kyra/gui_mr.h" #include "kyra/kyra_mr.h" #include "kyra/text_mr.h" -#include "kyra/wsamovie.h" #include "kyra/resource.h" -#include "kyra/sound.h" #include "kyra/timer.h" #include "common/system.h" diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp index 9cce543302..01922de7cf 100644 --- a/engines/kyra/gui_v2.cpp +++ b/engines/kyra/gui_v2.cpp @@ -24,7 +24,6 @@ */ #include "kyra/gui_v2.h" -#include "kyra/kyra_v2.h" #include "kyra/screen_v2.h" #include "kyra/text.h" #include "kyra/util.h" diff --git a/engines/kyra/items_lok.cpp b/engines/kyra/items_lok.cpp index f8271ad1e0..ed1299d239 100644 --- a/engines/kyra/items_lok.cpp +++ b/engines/kyra/items_lok.cpp @@ -24,14 +24,7 @@ */ #include "kyra/kyra_lok.h" -#include "kyra/seqplayer.h" -#include "kyra/screen.h" -#include "kyra/resource.h" -#include "kyra/sound.h" -#include "kyra/sprites.h" -#include "kyra/wsamovie.h" #include "kyra/animator_lok.h" -#include "kyra/text.h" #include "common/system.h" diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp index c73792ef8e..c326482e0a 100644 --- a/engines/kyra/kyra_hof.cpp +++ b/engines/kyra/kyra_hof.cpp @@ -23,14 +23,8 @@ * */ -#include "kyra/kyra_v1.h" #include "kyra/kyra_hof.h" -#include "kyra/screen.h" #include "kyra/resource.h" -#include "kyra/wsamovie.h" -#include "kyra/sound.h" -#include "kyra/script.h" -#include "kyra/script_tim.h" #include "kyra/text_hof.h" #include "kyra/timer.h" #include "kyra/debugger.h" diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index 978a5a3209..34ddbe7150 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -24,25 +24,19 @@ */ #include "kyra/kyra_lok.h" - -#include "common/system.h" -#include "common/config-manager.h" -#include "common/debug-channels.h" - -#include "gui/message.h" - #include "kyra/resource.h" -#include "kyra/screen.h" -#include "kyra/script.h" #include "kyra/seqplayer.h" -#include "kyra/sound.h" #include "kyra/sprites.h" -#include "kyra/wsamovie.h" #include "kyra/animator_lok.h" -#include "kyra/text.h" #include "kyra/debugger.h" #include "kyra/timer.h" +#include "common/system.h" +#include "common/config-manager.h" +#include "common/debug-channels.h" + +#include "gui/message.h" + namespace Kyra { KyraEngine_LoK::KyraEngine_LoK(OSystem *system, const GameFlags &flags) diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index 65e78448a5..edee0d0257 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -23,14 +23,10 @@ * */ -#include "kyra/kyra_v1.h" #include "kyra/kyra_mr.h" -#include "kyra/screen_mr.h" #include "kyra/wsamovie.h" -#include "kyra/sound.h" #include "kyra/text_mr.h" #include "kyra/vqa.h" -#include "kyra/gui.h" #include "kyra/timer.h" #include "kyra/debugger.h" #include "kyra/gui_mr.h" diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 506b262fa4..fb56e4a62a 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -23,22 +23,17 @@ * */ -#include "common/error.h" -#include "common/config-manager.h" -#include "common/debug-channels.h" -#include "common/EventRecorder.h" - -#include "audio/mididrv.h" -#include "audio/mixer.h" - #include "kyra/kyra_v1.h" #include "kyra/sound_intern.h" #include "kyra/resource.h" -#include "kyra/screen.h" -#include "kyra/text.h" #include "kyra/timer.h" #include "kyra/debugger.h" +#include "common/error.h" +#include "common/config-manager.h" +#include "common/debug-channels.h" +#include "common/EventRecorder.h" + namespace Kyra { KyraEngine_v1::KyraEngine_v1(OSystem *system, const GameFlags &flags) diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 38c176ead5..16b5ffa4e8 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -23,13 +23,13 @@ * */ +#include "kyra/kyra_v2.h" +#include "kyra/screen_v2.h" + #include "common/config-manager.h" #include "common/error.h" #include "common/system.h" -#include "kyra/kyra_v2.h" -#include "kyra/screen_v2.h" - namespace Kyra { KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags, const EngineDesc &desc) : KyraEngine_v1(system, flags), _desc(desc) { diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 613d5b0b81..718cce3663 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -28,17 +28,13 @@ #include "kyra/lol.h" #include "kyra/screen_lol.h" #include "kyra/resource.h" - -#include "kyra/sound.h" #include "kyra/timer.h" #include "kyra/util.h" #include "kyra/debugger.h" -#include "audio/decoders/voc.h" #include "audio/audiostream.h" #include "common/config-manager.h" -#include "common/endian.h" #include "common/system.h" namespace Kyra { diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index d14001aea6..81b3ec15ae 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -23,15 +23,15 @@ * */ -#include "common/endian.h" +#include "kyra/kyra_v1.h" +#include "kyra/util.h" + #include "common/savefile.h" #include "common/system.h" + #include "graphics/thumbnail.h" #include "graphics/surface.h" -#include "kyra/kyra_v1.h" -#include "kyra/util.h" - #define CURRENT_SAVE_VERSION 16 #define GF_FLOPPY (1 << 0) diff --git a/engines/kyra/saveload_hof.cpp b/engines/kyra/saveload_hof.cpp index 7a487dcf7b..1fd6c0f3c8 100644 --- a/engines/kyra/saveload_hof.cpp +++ b/engines/kyra/saveload_hof.cpp @@ -23,17 +23,15 @@ * */ -#include "common/endian.h" -#include "common/savefile.h" -#include "common/substream.h" -#include "common/system.h" - -#include "kyra/kyra_v2.h" +#include "kyra/kyra_hof.h" #include "kyra/screen_v2.h" -#include "kyra/resource.h" #include "kyra/sound.h" #include "kyra/timer.h" +#include "common/savefile.h" +#include "common/substream.h" +#include "common/system.h" + namespace Kyra { Common::Error KyraEngine_HoF::saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumb) { diff --git a/engines/kyra/saveload_lok.cpp b/engines/kyra/saveload_lok.cpp index 77d6bb9502..5af4f1d8ca 100644 --- a/engines/kyra/saveload_lok.cpp +++ b/engines/kyra/saveload_lok.cpp @@ -23,15 +23,14 @@ * */ -#include "common/savefile.h" - #include "kyra/kyra_lok.h" #include "kyra/animator_lok.h" -#include "kyra/screen.h" #include "kyra/resource.h" #include "kyra/sound.h" #include "kyra/timer.h" +#include "common/savefile.h" + namespace Kyra { Common::Error KyraEngine_LoK::loadGameState(int slot) { diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp index fdf8df3807..c5240e2624 100644 --- a/engines/kyra/saveload_lol.cpp +++ b/engines/kyra/saveload_lol.cpp @@ -27,7 +27,6 @@ #include "kyra/lol.h" #include "kyra/screen_lol.h" -#include "kyra/resource.h" #include "common/savefile.h" #include "common/substream.h" diff --git a/engines/kyra/scene_hof.cpp b/engines/kyra/scene_hof.cpp index 3797b70932..b44c88a0b4 100644 --- a/engines/kyra/scene_hof.cpp +++ b/engines/kyra/scene_hof.cpp @@ -24,12 +24,9 @@ */ #include "kyra/kyra_hof.h" -#include "kyra/screen_v2.h" #include "kyra/sound.h" -#include "kyra/wsamovie.h" #include "kyra/resource.h" -#include "common/func.h" #include "common/system.h" namespace Kyra { diff --git a/engines/kyra/scene_lok.cpp b/engines/kyra/scene_lok.cpp index 3abfe03fff..6200e2ab1e 100644 --- a/engines/kyra/scene_lok.cpp +++ b/engines/kyra/scene_lok.cpp @@ -24,19 +24,13 @@ */ #include "kyra/kyra_lok.h" -#include "kyra/seqplayer.h" -#include "kyra/screen.h" #include "kyra/resource.h" #include "kyra/sound.h" #include "kyra/sprites.h" -#include "kyra/wsamovie.h" #include "kyra/animator_lok.h" -#include "kyra/text.h" -#include "kyra/script.h" #include "kyra/timer.h" #include "common/system.h" -#include "common/savefile.h" namespace Kyra { diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp index 053f549c82..ab9f89456b 100644 --- a/engines/kyra/scene_lol.cpp +++ b/engines/kyra/scene_lol.cpp @@ -29,7 +29,6 @@ #include "kyra/screen_lol.h" #include "kyra/resource.h" #include "kyra/timer.h" -#include "kyra/sound.h" #include "common/endian.h" #include "common/system.h" diff --git a/engines/kyra/scene_mr.cpp b/engines/kyra/scene_mr.cpp index ccb77886a7..4eac4889b6 100644 --- a/engines/kyra/scene_mr.cpp +++ b/engines/kyra/scene_mr.cpp @@ -25,7 +25,6 @@ #include "kyra/kyra_mr.h" #include "kyra/screen_mr.h" -#include "kyra/wsamovie.h" #include "kyra/sound.h" #include "kyra/resource.h" diff --git a/engines/kyra/scene_v1.cpp b/engines/kyra/scene_v1.cpp index 848735b4a5..bc88377892 100644 --- a/engines/kyra/scene_v1.cpp +++ b/engines/kyra/scene_v1.cpp @@ -24,7 +24,6 @@ */ #include "kyra/kyra_v1.h" -#include "kyra/screen.h" namespace Kyra { diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp index 8255fc5837..897f2e937f 100644 --- a/engines/kyra/scene_v2.cpp +++ b/engines/kyra/scene_v2.cpp @@ -24,7 +24,6 @@ */ #include "kyra/kyra_v2.h" -#include "kyra/screen.h" #include "common/system.h" diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 9e25d2ea46..20a1022b26 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -23,6 +23,9 @@ * */ +#include "kyra/screen.h" +#include "kyra/kyra_v1.h" +#include "kyra/resource.h" #include "common/endian.h" #include "common/memstream.h" @@ -34,10 +37,6 @@ #include "graphics/palette.h" #include "graphics/sjis.h" -#include "kyra/screen.h" -#include "kyra/kyra_v1.h" -#include "kyra/resource.h" - namespace Kyra { Screen::Screen(KyraEngine_v1 *vm, OSystem *system) diff --git a/engines/kyra/screen_hof.cpp b/engines/kyra/screen_hof.cpp index a180c28442..f0af53f024 100644 --- a/engines/kyra/screen_hof.cpp +++ b/engines/kyra/screen_hof.cpp @@ -23,10 +23,8 @@ * */ -#include "common/endian.h" - -#include "kyra/kyra_hof.h" #include "kyra/screen_hof.h" +#include "kyra/kyra_hof.h" namespace Kyra { diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp index 1ce00f9b5b..2431cde20b 100644 --- a/engines/kyra/screen_lok.cpp +++ b/engines/kyra/screen_lok.cpp @@ -23,12 +23,11 @@ * */ -#include "kyra/kyra_lok.h" #include "kyra/screen_lok.h" +#include "kyra/kyra_lok.h" #include "common/system.h" -#include "graphics/cursorman.h" #include "graphics/palette.h" namespace Kyra { diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp index d2bc72bd80..20756e1fae 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -27,7 +27,6 @@ #include "kyra/screen_lol.h" #include "kyra/lol.h" -#include "kyra/resource.h" #include "common/system.h" diff --git a/engines/kyra/screen_mr.cpp b/engines/kyra/screen_mr.cpp index 33bfc517f7..4ae52b924d 100644 --- a/engines/kyra/screen_mr.cpp +++ b/engines/kyra/screen_mr.cpp @@ -24,7 +24,6 @@ */ #include "kyra/screen_mr.h" - #include "kyra/kyra_mr.h" namespace Kyra { diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp index 956bf39b5a..21dfe0bd31 100644 --- a/engines/kyra/script.cpp +++ b/engines/kyra/script.cpp @@ -23,15 +23,11 @@ * */ - -#include "common/endian.h" -#include "common/stream.h" -#include "common/util.h" -#include "common/system.h" - +#include "kyra/script.h" #include "kyra/kyra_v1.h" #include "kyra/resource.h" -#include "kyra/script.h" + +#include "common/endian.h" namespace Kyra { EMCInterpreter::EMCInterpreter(KyraEngine_v1 *vm) : _vm(vm), _scriptData(0), _filename(0) { diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp index ad13990cad..26a7accbe5 100644 --- a/engines/kyra/script_hof.cpp +++ b/engines/kyra/script_hof.cpp @@ -24,14 +24,9 @@ */ #include "kyra/kyra_hof.h" -#include "kyra/text_hof.h" -#include "kyra/wsamovie.h" -#include "kyra/sound.h" #include "kyra/timer.h" -#include "kyra/script_tim.h" #include "kyra/resource.h" -#include "common/endian.h" #include "common/system.h" namespace Kyra { diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp index a2bad8035e..30f1138360 100644 --- a/engines/kyra/script_lok.cpp +++ b/engines/kyra/script_lok.cpp @@ -23,12 +23,7 @@ * */ -#include "common/endian.h" -#include "common/system.h" - #include "kyra/kyra_lok.h" -#include "kyra/script.h" -#include "kyra/screen.h" #include "kyra/sprites.h" #include "kyra/wsamovie.h" #include "kyra/animator_lok.h" @@ -36,6 +31,8 @@ #include "kyra/timer.h" #include "kyra/sound.h" +#include "common/system.h" + namespace Kyra { int KyraEngine_LoK::o1_magicInMouseItem(EMCState *script) { diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp index 29e0324fe3..4ee3f326c0 100644 --- a/engines/kyra/script_lol.cpp +++ b/engines/kyra/script_lol.cpp @@ -30,7 +30,6 @@ #include "kyra/timer.h" #include "kyra/resource.h" -#include "common/endian.h" #include "common/system.h" namespace Kyra { diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp index c049a944dc..b3943e1aef 100644 --- a/engines/kyra/script_mr.cpp +++ b/engines/kyra/script_mr.cpp @@ -24,14 +24,9 @@ */ #include "kyra/kyra_mr.h" -#include "kyra/script.h" -#include "kyra/screen_mr.h" #include "kyra/text_mr.h" -#include "kyra/wsamovie.h" -#include "kyra/timer.h" #include "kyra/resource.h" -#include "common/endian.h" #include "common/system.h" namespace Kyra { diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index b990b68900..018beadf09 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -24,10 +24,7 @@ */ #include "kyra/script_tim.h" -#include "kyra/script.h" #include "kyra/resource.h" -#include "kyra/sound.h" -#include "kyra/wsamovie.h" #ifdef ENABLE_LOL #include "kyra/lol.h" @@ -35,7 +32,6 @@ #endif // ENABLE_LOL #include "common/iff_container.h" -#include "common/endian.h" #include "common/system.h" namespace Kyra { diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp index 7779a153cb..081f9dd517 100644 --- a/engines/kyra/script_v2.cpp +++ b/engines/kyra/script_v2.cpp @@ -27,7 +27,6 @@ #include "kyra/screen_v2.h" #include "kyra/timer.h" -#include "common/endian.h" #include "common/system.h" namespace Kyra { diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp index 5160224591..06f72df2c5 100644 --- a/engines/kyra/seqplayer.cpp +++ b/engines/kyra/seqplayer.cpp @@ -23,18 +23,10 @@ * */ - -#include "common/system.h" - -#include "engines/engine.h" - +#include "kyra/seqplayer.h" #include "kyra/resource.h" -#include "kyra/screen.h" -#include "kyra/sound.h" -#include "kyra/wsamovie.h" -#include "kyra/text.h" -#include "kyra/seqplayer.h" +#include "common/system.h" #define SEQOP(n, x) { n, &SeqPlayer::x, #x } diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp index c55153b802..015e0076c3 100644 --- a/engines/kyra/sequences_hof.cpp +++ b/engines/kyra/sequences_hof.cpp @@ -23,12 +23,7 @@ * */ -#include "kyra/kyra_v1.h" #include "kyra/kyra_hof.h" -#include "kyra/screen.h" -#include "kyra/wsamovie.h" -#include "kyra/sound.h" -#include "kyra/text_hof.h" #include "kyra/timer.h" #include "kyra/resource.h" diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp index 23af24064d..a08eb51f8d 100644 --- a/engines/kyra/sequences_lok.cpp +++ b/engines/kyra/sequences_lok.cpp @@ -25,13 +25,10 @@ #include "kyra/kyra_lok.h" #include "kyra/seqplayer.h" -#include "kyra/screen_lok.h" #include "kyra/resource.h" -#include "kyra/sound.h" #include "kyra/sprites.h" #include "kyra/wsamovie.h" #include "kyra/animator_lok.h" -#include "kyra/text.h" #include "kyra/timer.h" #include "common/system.h" diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index c65523db79..1392824235 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -24,16 +24,16 @@ */ -#include "kyra/resource.h" #include "kyra/sound.h" +#include "kyra/resource.h" #include "audio/mixer.h" -#include "audio/decoders/voc.h" #include "audio/audiostream.h" #include "audio/decoders/flac.h" #include "audio/decoders/mp3.h" #include "audio/decoders/raw.h" +#include "audio/decoders/voc.h" #include "audio/decoders/vorbis.h" namespace Kyra { diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index e2654afe12..16f6ca3eaa 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -40,10 +40,11 @@ */ +#include "kyra/sound_intern.h" +#include "kyra/resource.h" + #include "common/system.h" #include "common/mutex.h" -#include "kyra/resource.h" -#include "kyra/sound_intern.h" #include "audio/mixer.h" #include "audio/fmopl.h" diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index 7a50bb0808..fed21eba84 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -23,12 +23,11 @@ * */ -#include "kyra/resource.h" #include "kyra/sound_intern.h" +#include "kyra/resource.h" #include "audio/mixer.h" #include "audio/mods/maxtrax.h" -#include "audio/audiostream.h" namespace Kyra { diff --git a/engines/kyra/sound_lok.cpp b/engines/kyra/sound_lok.cpp index 3b1ee50f2a..83566372bf 100644 --- a/engines/kyra/sound_lok.cpp +++ b/engines/kyra/sound_lok.cpp @@ -23,8 +23,8 @@ * */ -#include "kyra/sound.h" #include "kyra/kyra_lok.h" +#include "kyra/sound.h" #include "common/system.h" diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp index 5c9dc8ccc6..10d35e03d5 100644 --- a/engines/kyra/sound_lol.cpp +++ b/engines/kyra/sound_lol.cpp @@ -25,8 +25,8 @@ #ifdef ENABLE_LOL -#include "kyra/sound.h" #include "kyra/lol.h" +#include "kyra/sound.h" #include "kyra/resource.h" #include "common/system.h" diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 084bae5aab..6b30824a2f 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -23,20 +23,17 @@ * */ +#include "kyra/sound_intern.h" +#include "kyra/resource.h" + #include "common/config-manager.h" #include "common/system.h" -#include "kyra/resource.h" -#include "kyra/sound_intern.h" -#include "kyra/screen.h" - #include "backends/audiocd/audiocd.h" #include "audio/audiostream.h" #include "audio/decoders/raw.h" -#include "common/util.h" - namespace Kyra { SoundTowns::SoundTowns(KyraEngine_v1 *vm, Audio::Mixer *mixer) diff --git a/engines/kyra/sprites.cpp b/engines/kyra/sprites.cpp index 52689869c6..23775d2946 100644 --- a/engines/kyra/sprites.cpp +++ b/engines/kyra/sprites.cpp @@ -23,19 +23,13 @@ * */ - -#include "common/endian.h" -#include "common/stream.h" -#include "common/util.h" -#include "common/system.h" -#include "common/EventRecorder.h" - -#include "kyra/screen.h" -#include "kyra/kyra_lok.h" #include "kyra/sprites.h" #include "kyra/resource.h" #include "kyra/animator_lok.h" +#include "common/system.h" +#include "common/EventRecorder.h" + namespace Kyra { Sprites::Sprites(KyraEngine_LoK *vm, OSystem *system) { diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index fe4bd2ad71..f83546e0dd 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -23,23 +23,22 @@ * */ -#include "common/endian.h" -#include "common/md5.h" -#include "kyra/kyra_v1.h" +#include "kyra/resource.h" #include "kyra/kyra_lok.h" -#include "kyra/kyra_v2.h" #include "kyra/kyra_hof.h" #include "kyra/kyra_mr.h" #include "kyra/screen.h" #include "kyra/screen_lok.h" #include "kyra/screen_hof.h" #include "kyra/screen_mr.h" -#include "kyra/resource.h" #include "kyra/gui_lok.h" #include "kyra/gui_hof.h" #include "kyra/gui_mr.h" #include "kyra/sound_intern.h" +#include "common/endian.h" +#include "common/md5.h" + namespace Kyra { #define RESFILE_VERSION 73 diff --git a/engines/kyra/text.cpp b/engines/kyra/text.cpp index 09f952f67e..e0114cda29 100644 --- a/engines/kyra/text.cpp +++ b/engines/kyra/text.cpp @@ -23,12 +23,8 @@ * */ -#include "kyra/kyra_v1.h" -#include "kyra/screen.h" #include "kyra/text.h" - -#include "common/system.h" -#include "common/endian.h" +#include "kyra/kyra_v1.h" namespace Kyra { diff --git a/engines/kyra/text_hof.cpp b/engines/kyra/text_hof.cpp index a1179b3605..c961d2bf49 100644 --- a/engines/kyra/text_hof.cpp +++ b/engines/kyra/text_hof.cpp @@ -24,11 +24,8 @@ */ #include "kyra/text_hof.h" -#include "kyra/kyra_hof.h" -#include "kyra/script_tim.h" #include "kyra/resource.h" -#include "common/endian.h" #include "common/system.h" namespace Kyra { diff --git a/engines/kyra/text_lok.cpp b/engines/kyra/text_lok.cpp index 4796d74955..cca8e5aaf5 100644 --- a/engines/kyra/text_lok.cpp +++ b/engines/kyra/text_lok.cpp @@ -23,9 +23,8 @@ * */ -#include "kyra/kyra_lok.h" -#include "kyra/screen_lok.h" #include "kyra/text.h" +#include "kyra/kyra_lok.h" #include "kyra/animator_lok.h" #include "kyra/sprites.h" #include "kyra/timer.h" diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp index 98f93e24f8..c8f65f57ce 100644 --- a/engines/kyra/text_lol.cpp +++ b/engines/kyra/text_lol.cpp @@ -25,10 +25,10 @@ #ifdef ENABLE_LOL +#include "kyra/text_lol.h" #include "kyra/lol.h" #include "kyra/screen_lol.h" #include "kyra/timer.h" -#include "kyra/util.h" #include "common/system.h" diff --git a/engines/kyra/text_lol.h b/engines/kyra/text_lol.h index 1e5bc8884e..edac131106 100644 --- a/engines/kyra/text_lol.h +++ b/engines/kyra/text_lol.h @@ -28,9 +28,11 @@ #ifndef KYRA_TEXT_LOL_H #define KYRA_TEXT_LOL_H +#include "common/scummsys.h" + namespace Kyra { -class Screen_v2; +class Screen_LoL; class LoLEngine; struct EMCState; diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp index cc10273c87..5679dc1ee6 100644 --- a/engines/kyra/text_mr.cpp +++ b/engines/kyra/text_mr.cpp @@ -24,7 +24,6 @@ */ #include "kyra/text_mr.h" -#include "kyra/screen_mr.h" #include "kyra/resource.h" #include "common/system.h" diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp index dbde3d30b7..475f17cadc 100644 --- a/engines/kyra/timer.cpp +++ b/engines/kyra/timer.cpp @@ -23,11 +23,8 @@ * */ -#include "kyra/kyra_v1.h" #include "kyra/timer.h" -#include "common/func.h" -#include "common/stream.h" #include "common/system.h" namespace Kyra { diff --git a/engines/kyra/timer_lok.cpp b/engines/kyra/timer_lok.cpp index 85b98be724..3a312c22c6 100644 --- a/engines/kyra/timer_lok.cpp +++ b/engines/kyra/timer_lok.cpp @@ -23,14 +23,10 @@ * */ -#include "kyra/kyra_v1.h" #include "kyra/kyra_lok.h" -#include "kyra/screen.h" #include "kyra/animator_lok.h" #include "kyra/timer.h" -#include "common/system.h" - namespace Kyra { #define TimerV1(x) new Common::Functor1Mem<int, void, KyraEngine_LoK>(this, &KyraEngine_LoK::x) diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp index aa6688f917..a3dab365c7 100644 --- a/engines/kyra/timer_lol.cpp +++ b/engines/kyra/timer_lol.cpp @@ -26,7 +26,6 @@ #ifdef ENABLE_LOL #include "kyra/lol.h" -#include "kyra/screen_lol.h" #include "kyra/timer.h" #include "common/system.h" diff --git a/engines/kyra/vqa.cpp b/engines/kyra/vqa.cpp index b3371793de..28071bc171 100644 --- a/engines/kyra/vqa.cpp +++ b/engines/kyra/vqa.cpp @@ -33,16 +33,14 @@ #include "kyra/vqa.h" +#include "kyra/resource.h" #include "common/system.h" + #include "audio/audiostream.h" #include "audio/mixer.h" #include "audio/decoders/raw.h" -#include "kyra/sound.h" -#include "kyra/screen.h" -#include "kyra/resource.h" - namespace Kyra { VQAMovie::VQAMovie(KyraEngine_v1 *vm, OSystem *system) { diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp index c9536484a3..db324d48d4 100644 --- a/engines/kyra/wsamovie.cpp +++ b/engines/kyra/wsamovie.cpp @@ -23,18 +23,13 @@ * */ - -#include "common/endian.h" -#include "common/system.h" - -#include "kyra/kyra_v1.h" -#include "kyra/kyra_v2.h" -#include "kyra/screen.h" -#include "kyra/screen_v2.h" #include "kyra/wsamovie.h" #include "kyra/resource.h" +#include "common/endian.h" + namespace Kyra { + WSAMovie_v1::WSAMovie_v1(KyraEngine_v1 *vm) : Movie(vm), _frameData(0), _frameOffsTable(0), _offscreenBuffer(0), _deltaBuffer(0) { } diff --git a/engines/kyra/wsamovie.h b/engines/kyra/wsamovie.h index d2c041742a..f755cdd557 100644 --- a/engines/kyra/wsamovie.h +++ b/engines/kyra/wsamovie.h @@ -26,10 +26,10 @@ #ifndef KYRA_WSAMOVIE_H #define KYRA_WSAMOVIE_H +#include "kyra/kyra_v1.h" + namespace Kyra { -class KyraEngine_v1; -class Screen_v2; class Palette; class Movie { |