diff options
author | Ori Avtalion | 2011-04-24 11:34:27 +0300 |
---|---|---|
committer | Ori Avtalion | 2011-04-28 15:08:58 +0300 |
commit | 9414d7a6e287ff8abfb5746b564e92c8f0e6de58 (patch) | |
tree | 7abed9aac21437c04915b59a2abe1c187661b238 /engines/kyra | |
parent | 845db59e088796df6628fcadb263ddc75f00f691 (diff) | |
download | scummvm-rg350-9414d7a6e287ff8abfb5746b564e92c8f0e6de58.tar.gz scummvm-rg350-9414d7a6e287ff8abfb5746b564e92c8f0e6de58.tar.bz2 scummvm-rg350-9414d7a6e287ff8abfb5746b564e92c8f0e6de58.zip |
JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
Diffstat (limited to 'engines/kyra')
50 files changed, 73 insertions, 29 deletions
diff --git a/engines/kyra/animator_hof.cpp b/engines/kyra/animator_hof.cpp index e1471239da..aa39ae6355 100644 --- a/engines/kyra/animator_hof.cpp +++ b/engines/kyra/animator_hof.cpp @@ -27,6 +27,7 @@ #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 b906d3a724..3f09362c5e 100644 --- a/engines/kyra/animator_lok.cpp +++ b/engines/kyra/animator_lok.cpp @@ -24,14 +24,15 @@ */ #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" -#include "common/system.h" - namespace Kyra { Animator_LoK::Animator_LoK(KyraEngine_LoK *vm, OSystem *system) { _vm = vm; diff --git a/engines/kyra/animator_mr.cpp b/engines/kyra/animator_mr.cpp index e6daba7aeb..47c0e3b03a 100644 --- a/engines/kyra/animator_mr.cpp +++ b/engines/kyra/animator_mr.cpp @@ -27,6 +27,8 @@ #include "kyra/resource.h" #include "kyra/wsamovie.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_MR::restorePage3() { diff --git a/engines/kyra/animator_v2.cpp b/engines/kyra/animator_v2.cpp index b06dffd36f..07ff4456e5 100644 --- a/engines/kyra/animator_v2.cpp +++ b/engines/kyra/animator_v2.cpp @@ -25,9 +25,6 @@ #include "kyra/kyra_v2.h" #include "kyra/screen_v2.h" -#include "kyra/wsamovie.h" - -#include "common/endian.h" namespace Kyra { diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index 6c111a6601..34d1834e0b 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -30,9 +30,11 @@ #include "common/config-manager.h" -#include "engines/advancedDetector.h" +#include "common/system.h" #include "common/savefile.h" +#include "engines/advancedDetector.h" + #include "base/plugins.h" struct KYRAGameDescription { diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index ff7bf233d2..8c1a8ab141 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -30,6 +30,7 @@ #include "kyra/wsamovie.h" #include "common/savefile.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp index 56971e563c..1a289807fa 100644 --- a/engines/kyra/gui_hof.cpp +++ b/engines/kyra/gui_hof.cpp @@ -31,7 +31,7 @@ #include "kyra/sound.h" #include "kyra/resource.h" -#include "common/savefile.h" +#include "common/system.h" #include "graphics/scaler.h" diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp index 3560478a1b..a4bec82f84 100644 --- a/engines/kyra/gui_lok.cpp +++ b/engines/kyra/gui_lok.cpp @@ -34,7 +34,6 @@ #include "kyra/util.h" #include "kyra/item.h" -#include "common/config-manager.h" #include "common/savefile.h" #include "common/system.h" diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp index 07fbf1664d..f52dd32c20 100644 --- a/engines/kyra/gui_lol.cpp +++ b/engines/kyra/gui_lol.cpp @@ -32,6 +32,7 @@ #include "kyra/util.h" #include "common/savefile.h" +#include "common/system.h" #include "common/config-manager.h" #include "graphics/scaler.h" diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp index 6bdecfc3b8..b34ff6a554 100644 --- a/engines/kyra/gui_mr.cpp +++ b/engines/kyra/gui_mr.cpp @@ -31,7 +31,7 @@ #include "kyra/sound.h" #include "kyra/timer.h" -#include "common/savefile.h" +#include "common/system.h" #include "graphics/scaler.h" diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp index 2247a0ca2e..9cce543302 100644 --- a/engines/kyra/gui_v2.cpp +++ b/engines/kyra/gui_v2.cpp @@ -30,6 +30,7 @@ #include "kyra/util.h" #include "common/savefile.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/items_hof.cpp b/engines/kyra/items_hof.cpp index 6a78a77c23..d460698272 100644 --- a/engines/kyra/items_hof.cpp +++ b/engines/kyra/items_hof.cpp @@ -25,6 +25,8 @@ #include "kyra/kyra_hof.h" +#include "common/system.h" + namespace Kyra { int KyraEngine_HoF::checkItemCollision(int x, int y) { diff --git a/engines/kyra/items_lok.cpp b/engines/kyra/items_lok.cpp index 322314e3ad..f8271ad1e0 100644 --- a/engines/kyra/items_lok.cpp +++ b/engines/kyra/items_lok.cpp @@ -34,7 +34,6 @@ #include "kyra/text.h" #include "common/system.h" -#include "common/savefile.h" namespace Kyra { diff --git a/engines/kyra/items_mr.cpp b/engines/kyra/items_mr.cpp index 2bc268ace3..5659876307 100644 --- a/engines/kyra/items_mr.cpp +++ b/engines/kyra/items_mr.cpp @@ -26,6 +26,8 @@ #include "kyra/kyra_mr.h" #include "kyra/timer.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_MR::removeTrashItems() { diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index d7ec6ada71..978a5a3209 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -25,9 +25,7 @@ #include "kyra/kyra_lok.h" -#include "common/file.h" #include "common/system.h" -#include "common/savefile.h" #include "common/config-manager.h" #include "common/debug-channels.h" diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index d1ff24ad85..cfa231e2d0 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -32,6 +32,10 @@ #include "kyra/gui_lok.h" #include "kyra/item.h" +namespace Graphics { +struct Surface; +} + namespace Kyra { class Movie; diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 3a5d21196b..506b262fa4 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -23,6 +23,7 @@ * */ +#include "common/error.h" #include "common/config-manager.h" #include "common/debug-channels.h" #include "common/EventRecorder.h" @@ -36,7 +37,6 @@ #include "kyra/screen.h" #include "kyra/text.h" #include "kyra/timer.h" -#include "kyra/script.h" #include "kyra/debugger.h" namespace Kyra { diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 801d31d676..08dc831dd9 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -29,10 +29,10 @@ #include "engines/engine.h" #include "common/array.h" +#include "common/error.h" #include "common/events.h" #include "common/random.h" #include "common/hashmap.h" -#include "common/system.h" #include "audio/mixer.h" @@ -44,6 +44,10 @@ class SeekableReadStream; class WriteStream; } // End of namespace Common +namespace Graphics { +struct Surface; +} + class KyraMetaEngine; /** @@ -166,7 +170,6 @@ enum MusicDataID { class Screen; class Resource; class Sound; -class Movie; class TextDisplayer; class StaticResource; class TimerManager; diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 804097c81d..38c176ead5 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -24,10 +24,11 @@ */ #include "common/config-manager.h" +#include "common/error.h" +#include "common/system.h" #include "kyra/kyra_v2.h" #include "kyra/screen_v2.h" -#include "kyra/debugger.h" namespace Kyra { diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 78c9ed260d..613d5b0b81 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -39,6 +39,7 @@ #include "common/config-manager.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index 63b8072654..22786c1c7e 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -27,11 +27,7 @@ #include "kyra/resource_intern.h" #include "common/config-manager.h" -#include "common/endian.h" -#include "common/file.h" #include "common/fs.h" -#include "common/func.h" -#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/saveload_lok.cpp b/engines/kyra/saveload_lok.cpp index 012ff138b5..77d6bb9502 100644 --- a/engines/kyra/saveload_lok.cpp +++ b/engines/kyra/saveload_lok.cpp @@ -23,9 +23,7 @@ * */ -#include "common/endian.h" #include "common/savefile.h" -#include "common/system.h" #include "kyra/kyra_lok.h" #include "kyra/animator_lok.h" diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp index b6c0693a16..fdf8df3807 100644 --- a/engines/kyra/saveload_lol.cpp +++ b/engines/kyra/saveload_lol.cpp @@ -29,10 +29,8 @@ #include "kyra/screen_lol.h" #include "kyra/resource.h" -#include "common/endian.h" #include "common/savefile.h" #include "common/substream.h" -#include "common/system.h" #include "graphics/scaler.h" diff --git a/engines/kyra/scene_hof.cpp b/engines/kyra/scene_hof.cpp index 79827361a3..3797b70932 100644 --- a/engines/kyra/scene_hof.cpp +++ b/engines/kyra/scene_hof.cpp @@ -30,6 +30,7 @@ #include "kyra/resource.h" #include "common/func.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp index e070b91a44..053f549c82 100644 --- a/engines/kyra/scene_lol.cpp +++ b/engines/kyra/scene_lol.cpp @@ -32,6 +32,7 @@ #include "kyra/sound.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/scene_mr.cpp b/engines/kyra/scene_mr.cpp index acb0710616..ccb77886a7 100644 --- a/engines/kyra/scene_mr.cpp +++ b/engines/kyra/scene_mr.cpp @@ -29,6 +29,8 @@ #include "kyra/sound.h" #include "kyra/resource.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_MR::enterNewScene(uint16 sceneId, int facing, int unk1, int unk2, int unk3) { diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp index fdfbceb521..8255fc5837 100644 --- a/engines/kyra/scene_v2.cpp +++ b/engines/kyra/scene_v2.cpp @@ -26,6 +26,8 @@ #include "kyra/kyra_v2.h" #include "kyra/screen.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_v2::freeSceneAnims() { diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 58d8e7f3d4..9e25d2ea46 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -31,6 +31,7 @@ #include "engines/util.h" #include "graphics/cursorman.h" +#include "graphics/palette.h" #include "graphics/sjis.h" #include "kyra/screen.h" diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp index 227349754f..1ce00f9b5b 100644 --- a/engines/kyra/screen_lok.cpp +++ b/engines/kyra/screen_lok.cpp @@ -26,7 +26,10 @@ #include "kyra/kyra_lok.h" #include "kyra/screen_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 ff35facbb5..d2bc72bd80 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -29,6 +29,10 @@ #include "kyra/lol.h" #include "kyra/resource.h" +#include "common/system.h" + +#include "graphics/palette.h" + namespace Kyra { Screen_LoL::Screen_LoL(LoLEngine *vm, OSystem *system) : Screen_v2(vm, system), _vm(vm) { diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp index d57bb7efc5..ad13990cad 100644 --- a/engines/kyra/script_hof.cpp +++ b/engines/kyra/script_hof.cpp @@ -32,6 +32,7 @@ #include "kyra/resource.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp index c9fb8df1fb..29e0324fe3 100644 --- a/engines/kyra/script_lol.cpp +++ b/engines/kyra/script_lol.cpp @@ -31,6 +31,7 @@ #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 18878b6543..c049a944dc 100644 --- a/engines/kyra/script_mr.cpp +++ b/engines/kyra/script_mr.cpp @@ -32,6 +32,7 @@ #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 1e978caf15..b990b68900 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -36,6 +36,7 @@ #include "common/iff_container.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/script_tim.h b/engines/kyra/script_tim.h index 91f2e8589e..7cf7d0a7dd 100644 --- a/engines/kyra/script_tim.h +++ b/engines/kyra/script_tim.h @@ -36,6 +36,7 @@ namespace Kyra { class WSAMovie_v2; class Screen_v2; +class Movie; class LoLEngine; class TimAnimator { diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp index 12f26ec5f6..13fdcb7d97 100644 --- a/engines/kyra/script_v1.cpp +++ b/engines/kyra/script_v1.cpp @@ -26,6 +26,8 @@ #include "kyra/kyra_v1.h" #include "kyra/screen.h" +#include "common/system.h" + namespace Kyra { int KyraEngine_v1::o1_queryGameFlag(EMCState *script) { diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp index 17e882398e..7779a153cb 100644 --- a/engines/kyra/script_v2.cpp +++ b/engines/kyra/script_v2.cpp @@ -28,6 +28,7 @@ #include "kyra/timer.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp index e8ea7a9dcb..35888421d0 100644 --- a/engines/kyra/sequences_lol.cpp +++ b/engines/kyra/sequences_lol.cpp @@ -31,6 +31,8 @@ #include "base/version.h" +#include "common/system.h" + namespace Kyra { #pragma mark - Intro diff --git a/engines/kyra/sequences_v2.cpp b/engines/kyra/sequences_v2.cpp index 3824676213..4d9cdf0d5d 100644 --- a/engines/kyra/sequences_v2.cpp +++ b/engines/kyra/sequences_v2.cpp @@ -26,6 +26,8 @@ #include "kyra/kyra_v2.h" #include "kyra/resource.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_v2::runAnimationScript(const char *filename, int allowSkip, int resetChar, int newShapes, int shapeUnload) { diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 9dd046e50b..c65523db79 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -24,9 +24,6 @@ */ -#include "common/system.h" -#include "common/config-manager.h" - #include "kyra/resource.h" #include "kyra/sound.h" diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index c5e9f6171d..7a50bb0808 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -23,8 +23,6 @@ * */ -#include "common/system.h" -#include "common/mutex.h" #include "kyra/resource.h" #include "kyra/sound_intern.h" diff --git a/engines/kyra/sound_lok.cpp b/engines/kyra/sound_lok.cpp index 40daa0b5bd..3b1ee50f2a 100644 --- a/engines/kyra/sound_lok.cpp +++ b/engines/kyra/sound_lok.cpp @@ -26,6 +26,8 @@ #include "kyra/sound.h" #include "kyra/kyra_lok.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_LoK::snd_playSoundEffect(int track, int volume) { diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp index 87679f5bfb..5c9dc8ccc6 100644 --- a/engines/kyra/sound_lol.cpp +++ b/engines/kyra/sound_lol.cpp @@ -29,6 +29,8 @@ #include "kyra/lol.h" #include "kyra/resource.h" +#include "common/system.h" + #include "audio/audiostream.h" namespace Kyra { diff --git a/engines/kyra/text_hof.cpp b/engines/kyra/text_hof.cpp index 4c292b70db..a1179b3605 100644 --- a/engines/kyra/text_hof.cpp +++ b/engines/kyra/text_hof.cpp @@ -29,6 +29,7 @@ #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 40f2217a2b..4796d74955 100644 --- a/engines/kyra/text_lok.cpp +++ b/engines/kyra/text_lok.cpp @@ -30,6 +30,8 @@ #include "kyra/sprites.h" #include "kyra/timer.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_LoK::waitForChatToFinish(int vocFile, int16 chatDuration, const char *chatStr, uint8 charNum, const bool printText) { diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp index 9f98586303..98f93e24f8 100644 --- a/engines/kyra/text_lol.cpp +++ b/engines/kyra/text_lol.cpp @@ -30,6 +30,8 @@ #include "kyra/timer.h" #include "kyra/util.h" +#include "common/system.h" + namespace Kyra { TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *vm, Screen_LoL *screen) : _vm(vm), _screen(screen), diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp index 001faab016..cc10273c87 100644 --- a/engines/kyra/text_mr.cpp +++ b/engines/kyra/text_mr.cpp @@ -27,6 +27,8 @@ #include "kyra/screen_mr.h" #include "kyra/resource.h" +#include "common/system.h" + namespace Kyra { TextDisplayer_MR::TextDisplayer_MR(KyraEngine_MR *vm, Screen_MR *screen) diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp index 66b78d3c03..dbde3d30b7 100644 --- a/engines/kyra/timer.cpp +++ b/engines/kyra/timer.cpp @@ -28,6 +28,7 @@ #include "common/func.h" #include "common/stream.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp index 90cfc1af78..aa6688f917 100644 --- a/engines/kyra/timer_lol.cpp +++ b/engines/kyra/timer_lol.cpp @@ -29,6 +29,8 @@ #include "kyra/screen_lol.h" #include "kyra/timer.h" +#include "common/system.h" + namespace Kyra { #define TimerV2(x) new Common::Functor1Mem<int, void, LoLEngine>(this, &LoLEngine::x) diff --git a/engines/kyra/timer_mr.cpp b/engines/kyra/timer_mr.cpp index 0d89decf5a..97ce7c166d 100644 --- a/engines/kyra/timer_mr.cpp +++ b/engines/kyra/timer_mr.cpp @@ -26,6 +26,8 @@ #include "kyra/kyra_mr.h" #include "kyra/timer.h" +#include "common/system.h" + namespace Kyra { #define TimerV3(x) new Common::Functor1Mem<int, void, KyraEngine_MR>(this, &KyraEngine_MR::x) |