diff options
author | Matthew Hoops | 2011-05-11 00:30:02 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-05-11 00:30:28 -0400 |
commit | a1d41da096c0bcf502a85919cb1cb1ee471719c5 (patch) | |
tree | 8c51419daa486f1d4833757db4715dadab6c3497 /engines/kyra | |
parent | accb0c2a5d0c9e7b353cda4b74f511a498ed8073 (diff) | |
parent | 33c3e19cea2a08fbf26ecbe940763e8ee1c37d28 (diff) | |
download | scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.tar.gz scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.tar.bz2 scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.zip |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
audio/decoders/qdm2.h
common/util.cpp
engines/groovie/music.cpp
engines/groovie/resource.h
video/qt_decoder.cpp
video/qt_decoder.h
Diffstat (limited to 'engines/kyra')
77 files changed, 183 insertions, 262 deletions
diff --git a/engines/kyra/animator_hof.cpp b/engines/kyra/animator_hof.cpp index e1471239da..a563bc2b4f 100644 --- a/engines/kyra/animator_hof.cpp +++ b/engines/kyra/animator_hof.cpp @@ -26,7 +26,7 @@ #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 b906d3a724..452d5e8062 100644 --- a/engines/kyra/animator_lok.cpp +++ b/engines/kyra/animator_lok.cpp @@ -23,16 +23,13 @@ * */ -#include "common/endian.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; _screen = vm->screen(); 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_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/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/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 6c111a6601..87cda9f3b6 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -22,17 +22,17 @@ * $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 "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..849b65a24b 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -25,11 +25,11 @@ #include "kyra/gui.h" -#include "kyra/screen.h" #include "kyra/text.h" #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..26e0d8f18a 100644 --- a/engines/kyra/gui_hof.cpp +++ b/engines/kyra/gui_hof.cpp @@ -23,15 +23,13 @@ * */ -#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 "kyra/sound.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..c31cbe3db2 100644 --- a/engines/kyra/gui_lok.cpp +++ b/engines/kyra/gui_lok.cpp @@ -23,18 +23,13 @@ * */ +#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/config-manager.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 07fbf1664d..2625347d50 100644 --- a/engines/kyra/gui_lol.cpp +++ b/engines/kyra/gui_lol.cpp @@ -25,13 +25,15 @@ #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" +#include "kyra/sound.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..6eca24fd46 100644 --- a/engines/kyra/gui_mr.cpp +++ b/engines/kyra/gui_mr.cpp @@ -26,12 +26,11 @@ #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 "kyra/sound.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..01922de7cf 100644 --- a/engines/kyra/gui_v2.cpp +++ b/engines/kyra/gui_v2.cpp @@ -24,12 +24,12 @@ */ #include "kyra/gui_v2.h" -#include "kyra/kyra_v2.h" #include "kyra/screen_v2.h" #include "kyra/text.h" #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..ed1299d239 100644 --- a/engines/kyra/items_lok.cpp +++ b/engines/kyra/items_lok.cpp @@ -24,17 +24,9 @@ */ #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" -#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_hof.cpp b/engines/kyra/kyra_hof.cpp index c73792ef8e..de6aa55b08 100644 --- a/engines/kyra/kyra_hof.cpp +++ b/engines/kyra/kyra_hof.cpp @@ -23,18 +23,13 @@ * */ -#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" #include "kyra/util.h" +#include "kyra/sound.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index d7ec6ada71..a04c28cad8 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -24,26 +24,19 @@ */ #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" - -#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 "kyra/sound.h" + +#include "common/system.h" +#include "common/config-manager.h" +#include "common/debug-channels.h" + +#include "gui/message.h" namespace Kyra { 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_mr.cpp b/engines/kyra/kyra_mr.cpp index 65e78448a5..570ebe0bab 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -23,18 +23,15 @@ * */ -#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" #include "kyra/resource.h" +#include "kyra/sound.h" #include "common/system.h" #include "common/config-manager.h" diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 3a5d21196b..fb56e4a62a 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -23,22 +23,17 @@ * */ -#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/script.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_v1.h b/engines/kyra/kyra_v1.h index cf51774b0f..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; @@ -247,7 +250,7 @@ protected: Common::Error err; registerDefaultSettings(); err = init(); - if (err != Common::kNoError) + if (err.getCode() != Common::kNoError) return err; return go(); } diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 804097c81d..16b5ffa4e8 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -23,11 +23,12 @@ * */ -#include "common/config-manager.h" - #include "kyra/kyra_v2.h" #include "kyra/screen_v2.h" -#include "kyra/debugger.h" + +#include "common/config-manager.h" +#include "common/error.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 5928c40f92..ce73bffc89 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -28,17 +28,15 @@ #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 "kyra/sound.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 { @@ -591,7 +589,9 @@ Common::Error LoLEngine::go() { if (action == 0) { startupNew(); } else if (_gameToLoad != -1) { - if (loadGameState(_gameToLoad) != Common::kNoError) + // FIXME: Instead of throwing away the error returned by + // loadGameState, we should use it / augment it. + if (loadGameState(_gameToLoad).getCode() != Common::kNoError) error("Couldn't load game slot %d on startup", _gameToLoad); _gameToLoad = -1; } @@ -918,7 +918,9 @@ void LoLEngine::runLoop() { while (!shouldQuit() && _runFlag) { if (_gameToLoad != -1) { - if (loadGameState(_gameToLoad) != Common::kNoError) + // FIXME: Instead of throwing away the error returned by + // loadGameState, we should use it / augment it. + if (loadGameState(_gameToLoad).getCode() != Common::kNoError) error("Couldn't load game slot %d", _gameToLoad); _gameToLoad = -1; } diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h index d24f3b427f..a3170c2193 100644 --- a/engines/kyra/lol.h +++ b/engines/kyra/lol.h @@ -31,12 +31,15 @@ #include "kyra/kyra_v1.h" #include "kyra/script_tim.h" #include "kyra/script.h" -#include "kyra/sound.h" #include "kyra/gui_lol.h" #include "kyra/text_lol.h" #include "common/list.h" +namespace Audio { +class SeekableAudioStream; +} // End of namespace Audio + namespace Kyra { class Screen_LoL; 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.cpp b/engines/kyra/saveload.cpp index 44579c3377..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) @@ -257,7 +257,9 @@ void KyraEngine_v1::checkAutosave() { } void KyraEngine_v1::loadGameStateCheck(int slot) { - if (loadGameState(slot) != Common::kNoError) { + // FIXME: Instead of throwing away the error returned by + // loadGameState, we should use it / augment it. + if (loadGameState(slot).getCode() != Common::kNoError) { const char *filename = getSavegameFilename(slot); Common::String errorMessage = "Could not load savegame: '"; errorMessage += filename; 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 012ff138b5..5af4f1d8ca 100644 --- a/engines/kyra/saveload_lok.cpp +++ b/engines/kyra/saveload_lok.cpp @@ -23,17 +23,14 @@ * */ -#include "common/endian.h" -#include "common/savefile.h" -#include "common/system.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 b6c0693a16..c5240e2624 100644 --- a/engines/kyra/saveload_lol.cpp +++ b/engines/kyra/saveload_lol.cpp @@ -27,12 +27,9 @@ #include "kyra/lol.h" #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..b44c88a0b4 100644 --- a/engines/kyra/scene_hof.cpp +++ b/engines/kyra/scene_hof.cpp @@ -24,12 +24,10 @@ */ #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 e070b91a44..ab9f89456b 100644 --- a/engines/kyra/scene_lol.cpp +++ b/engines/kyra/scene_lol.cpp @@ -29,9 +29,9 @@ #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" namespace Kyra { diff --git a/engines/kyra/scene_mr.cpp b/engines/kyra/scene_mr.cpp index acb0710616..4eac4889b6 100644 --- a/engines/kyra/scene_mr.cpp +++ b/engines/kyra/scene_mr.cpp @@ -25,10 +25,11 @@ #include "kyra/kyra_mr.h" #include "kyra/screen_mr.h" -#include "kyra/wsamovie.h" #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_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 fdfbceb521..897f2e937f 100644 --- a/engines/kyra/scene_v2.cpp +++ b/engines/kyra/scene_v2.cpp @@ -24,7 +24,8 @@ */ #include "kyra/kyra_v2.h" -#include "kyra/screen.h" + +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 58d8e7f3d4..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" @@ -31,12 +34,9 @@ #include "engines/util.h" #include "graphics/cursorman.h" +#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 227349754f..2431cde20b 100644 --- a/engines/kyra/screen_lok.cpp +++ b/engines/kyra/screen_lok.cpp @@ -23,10 +23,12 @@ * */ -#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 ff35facbb5..20756e1fae 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -27,7 +27,10 @@ #include "kyra/screen_lol.h" #include "kyra/lol.h" -#include "kyra/resource.h" + +#include "common/system.h" + +#include "graphics/palette.h" namespace Kyra { 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 d57bb7efc5..056319e6d4 100644 --- a/engines/kyra/script_hof.cpp +++ b/engines/kyra/script_hof.cpp @@ -24,14 +24,11 @@ */ #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 "kyra/sound.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 c9fb8df1fb..3185032218 100644 --- a/engines/kyra/script_lol.cpp +++ b/engines/kyra/script_lol.cpp @@ -29,8 +29,9 @@ #include "kyra/screen_lol.h" #include "kyra/timer.h" #include "kyra/resource.h" +#include "kyra/sound.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..b3943e1aef 100644 --- a/engines/kyra/script_mr.cpp +++ b/engines/kyra/script_mr.cpp @@ -24,14 +24,10 @@ */ #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 1e978caf15..004ceb97bb 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -24,10 +24,8 @@ */ #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 +33,7 @@ #endif // ENABLE_LOL #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..081f9dd517 100644 --- a/engines/kyra/script_v2.cpp +++ b/engines/kyra/script_v2.cpp @@ -27,7 +27,7 @@ #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..16e89de146 100644 --- a/engines/kyra/seqplayer.cpp +++ b/engines/kyra/seqplayer.cpp @@ -23,18 +23,11 @@ * */ - -#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..b268f13fc1 100644 --- a/engines/kyra/sequences_hof.cpp +++ b/engines/kyra/sequences_hof.cpp @@ -23,14 +23,10 @@ * */ -#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" +#include "kyra/sound.h" #include "common/system.h" diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp index 23af24064d..0b39201f85 100644 --- a/engines/kyra/sequences_lok.cpp +++ b/engines/kyra/sequences_lok.cpp @@ -25,14 +25,12 @@ #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 "kyra/sound.h" #include "common/system.h" #include "common/savefile.h" diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp index e8ea7a9dcb..da1245d7e6 100644 --- a/engines/kyra/sequences_lol.cpp +++ b/engines/kyra/sequences_lol.cpp @@ -28,9 +28,12 @@ #include "kyra/lol.h" #include "kyra/screen_lol.h" #include "kyra/resource.h" +#include "kyra/sound.h" #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..1392824235 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -24,19 +24,16 @@ */ -#include "common/system.h" -#include "common/config-manager.h" - -#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 758d66192d..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" @@ -909,7 +910,7 @@ void AdLibDriver::unkOutput2(uint8 chan) { // including the two most significant frequency bit, and the octave - // set to zero. // - // This is very strange behaviour, and causes problems with the ancient + // This is very strange behavior, and causes problems with the ancient // FMOPL code we borrowed from AdPlug. I've added a workaround. See // fmopl.cpp for more details. // @@ -984,7 +985,7 @@ void AdLibDriver::setupNote(uint8 rawNote, Channel &channel, bool flag) { uint16 freq = _unkTable[note] + channel.baseFreq; - // When called from callback 41, the behaviour is slightly different: + // When called from callback 41, the behavior is slightly different: // We adjust the frequency, even when channel.unk16 is 0. if (channel.unk16 || flag) { @@ -1093,12 +1094,12 @@ void AdLibDriver::adjustVolume(Channel &channel) { // tree) and turning Kallak to stone. Related functions and variables: // // update_setupPrimaryEffect1() -// - Initialises unk29, unk30 and unk31 +// - Initializes unk29, unk30 and unk31 // - unk29 is not further modified // - unk30 is not further modified, except by update_removePrimaryEffect1() // // update_removePrimaryEffect1() -// - Deinitialises unk30 +// - Deinitializes unk30 // // unk29 - determines how often the notes are played // unk30 - modifies the frequency @@ -1115,7 +1116,7 @@ void AdLibDriver::primaryEffect1(Channel &channel) { if (channel.unk31 >= temp) return; - // Initialise unk1 to the current frequency + // Initialize unk1 to the current frequency uint16 unk1 = ((channel.regBx & 3) << 8) | channel.regAx; // This is presumably to shift the "note on" bit so far to the left @@ -1167,10 +1168,10 @@ void AdLibDriver::primaryEffect1(Channel &channel) { // and leaving Kallak's hut. Related functions and variables: // // update_setupPrimaryEffect2() -// - Initialises unk32, unk33, unk34, unk35 and unk36 +// - Initializes unk32, unk33, unk34, unk35 and unk36 // - unk32 is not further modified // - unk33 is not further modified -// - unk34 is a countdown that gets reinitialised to unk35 on zero +// - unk34 is a countdown that gets reinitialized to unk35 on zero // - unk35 is based on unk34 and not further modified // - unk36 is not further modified // @@ -1182,13 +1183,13 @@ void AdLibDriver::primaryEffect1(Channel &channel) { // unk32 - determines how often the notes are played // unk33 - modifies the frequency // unk34 - countdown, updates frequency on zero -// unk35 - initialiser for unk34 countdown -// unk36 - initialiser for unk38 countdown +// unk35 - initializer for unk34 countdown +// unk36 - initializer for unk38 countdown // unk37 - frequency // unk38 - countdown, begins playing on zero // unk41 - determines how often the notes are played // -// Note that unk41 is never initialised. Not that it should matter much, but it +// Note that unk41 is never initialized. Not that it should matter much, but it // is a bit sloppy. void AdLibDriver::primaryEffect2(Channel &channel) { diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index c5e9f6171d..fed21eba84 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -23,14 +23,11 @@ * */ -#include "common/system.h" -#include "common/mutex.h" -#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 40daa0b5bd..83566372bf 100644 --- a/engines/kyra/sound_lok.cpp +++ b/engines/kyra/sound_lok.cpp @@ -23,8 +23,10 @@ * */ -#include "kyra/sound.h" #include "kyra/kyra_lok.h" +#include "kyra/sound.h" + +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp index 87679f5bfb..10d35e03d5 100644 --- a/engines/kyra/sound_lol.cpp +++ b/engines/kyra/sound_lol.cpp @@ -25,10 +25,12 @@ #ifdef ENABLE_LOL -#include "kyra/sound.h" #include "kyra/lol.h" +#include "kyra/sound.h" #include "kyra/resource.h" +#include "common/system.h" + #include "audio/audiostream.h" namespace Kyra { 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 4c292b70db..c961d2bf49 100644 --- a/engines/kyra/text_hof.cpp +++ b/engines/kyra/text_hof.cpp @@ -24,11 +24,9 @@ */ #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 40f2217a2b..cca8e5aaf5 100644 --- a/engines/kyra/text_lok.cpp +++ b/engines/kyra/text_lok.cpp @@ -23,13 +23,14 @@ * */ -#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" +#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..c9a77be1b2 100644 --- a/engines/kyra/text_lol.cpp +++ b/engines/kyra/text_lol.cpp @@ -25,10 +25,13 @@ #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 "kyra/sound.h" + +#include "common/system.h" namespace Kyra { 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 001faab016..5679dc1ee6 100644 --- a/engines/kyra/text_mr.cpp +++ b/engines/kyra/text_mr.cpp @@ -24,9 +24,10 @@ */ #include "kyra/text_mr.h" -#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..475f17cadc 100644 --- a/engines/kyra/timer.cpp +++ b/engines/kyra/timer.cpp @@ -23,11 +23,9 @@ * */ -#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 90cfc1af78..a3dab365c7 100644 --- a/engines/kyra/timer_lol.cpp +++ b/engines/kyra/timer_lol.cpp @@ -26,9 +26,10 @@ #ifdef ENABLE_LOL #include "kyra/lol.h" -#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) 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 { |