MOHAWK: Reduce header interdependencies

svn-id: r46782

17 files changed, 49 insertions, 22 deletions

diff --git a/engines/mohawk/console.cpp b/engines/mohawk/console.cpp
index 8ff1d158da..099e6c926e 100644
--- a/engines/mohawk/console.cpp
+++ b/engines/mohawk/console.cpp
@@ -29,6 +29,8 @@
 #include "mohawk/graphics.h"
 #include "mohawk/riven.h"
 #include "mohawk/livingbooks.h"
+#include "mohawk/sound.h"
+#include "mohawk/video/video.h"
 
 namespace Mohawk {
 
diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index 7e310c8760..8b900dc586 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -63,15 +63,15 @@ uint16 MohawkEngine::getVersion() const {
 	return _gameDescription->version;
 }
 
-uint8 MohawkEngine::getGameType() {
+uint8 MohawkEngine::getGameType() const {
 	return _gameDescription->gameType;
 }
 
-Common::String MohawkEngine_LivingBooks::getBookInfoFileName() {
+Common::String MohawkEngine_LivingBooks::getBookInfoFileName() const {
 	return _gameDescription->desc.filesDescriptions[0].fileName;
 }
 
-Common::Language MohawkEngine::getLanguage() {
+Common::Language MohawkEngine::getLanguage() const {
 	return _gameDescription->desc.language;
 }
 
diff --git a/engines/mohawk/dialogs.h b/engines/mohawk/dialogs.h
index 5b3aad2446..5b46158eac 100644
--- a/engines/mohawk/dialogs.h
+++ b/engines/mohawk/dialogs.h
@@ -38,6 +38,8 @@
 namespace Mohawk {
 
 class MohawkEngine;
+class MohawkEngine_Myst;
+class MohawkEngine_Riven;
 
 class InfoDialog : public GUI::Dialog {
 protected:
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 56e555db6d..88b3998af7 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -26,6 +26,8 @@
 #include "mohawk/livingbooks.h"
 #include "mohawk/file.h"
 
+#include "common/events.h"
+
 namespace Mohawk {
 
 MohawkEngine_LivingBooks::MohawkEngine_LivingBooks(OSystem *syst, const MohawkGameDescription *gamedesc) : MohawkEngine(syst, gamedesc) {
@@ -321,4 +323,8 @@ Common::String MohawkEngine_LivingBooks::convertWinFileName(Common::String strin
 	return filename;
 }
 
+MohawkFile *MohawkEngine_LivingBooks::createMohawkFile() const {
+	return (getGameType() == GType_NEWLIVINGBOOKS) ? new MohawkFile() : new OldMohawkFile();
+}
+
 } // End of namespace Mohawk
diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h
index 3053045574..42098bb560 100644
--- a/engines/mohawk/livingbooks.h
+++ b/engines/mohawk/livingbooks.h
@@ -59,7 +59,7 @@ private:
 	Common::ConfigFile _bookInfoFile;
 
 	uint16 _curPage;
-	Common::String getBookInfoFileName();
+	Common::String getBookInfoFileName() const;
 	void loadBookInfo(Common::String filename);
 	void loadIntro();
 
@@ -85,8 +85,8 @@ private:
 	Common::String getFileNameFromConfig(Common::String section, Common::String key);
 	
 	// Platform/Version functions
-	bool isBigEndian() { return getGameType() == GType_NEWLIVINGBOOKS || getPlatform() == Common::kPlatformMacintosh; }
-	MohawkFile *createMohawkFile() { return (getGameType() == GType_NEWLIVINGBOOKS) ? new MohawkFile() : new OldMohawkFile(); }
+	bool isBigEndian() const { return getGameType() == GType_NEWLIVINGBOOKS || getPlatform() == Common::kPlatformMacintosh; }
+	MohawkFile *createMohawkFile() const;
 };
 
 } // End of namespace Mohawk
diff --git a/engines/mohawk/mohawk.cpp b/engines/mohawk/mohawk.cpp
index 16b542ac51..147c242a6a 100644
--- a/engines/mohawk/mohawk.cpp
+++ b/engines/mohawk/mohawk.cpp
@@ -33,6 +33,11 @@
 #include "base/version.h"
 
 #include "mohawk/mohawk.h"
+#include "mohawk/dialogs.h"
+#include "mohawk/sound.h"
+#include "mohawk/video/video.h"
+
+#include "sound/mixer.h"
 
 namespace Mohawk {
 
diff --git a/engines/mohawk/mohawk.h b/engines/mohawk/mohawk.h
index c71c525707..c8c16da3c0 100644
--- a/engines/mohawk/mohawk.h
+++ b/engines/mohawk/mohawk.h
@@ -27,20 +27,11 @@
 #define MOHAWK_H
 
 #include "common/scummsys.h"
-#include "common/util.h"
-#include "common/system.h"
-#include "common/rect.h"
 #include "common/array.h"
 
 #include "engines/engine.h"
 
-#include "gui/dialog.h"
-
-#include "mohawk/console.h"
-#include "mohawk/dialogs.h"
-#include "mohawk/file.h"
-#include "mohawk/sound.h"
-#include "mohawk/video/video.h"
+class OSystem;
 
 namespace Mohawk {
 
@@ -72,6 +63,8 @@ enum MohawkGameFeatures {
 struct MohawkGameDescription;
 class Sound;
 class PauseDialog;
+class MohawkFile;
+class VideoManager;
 
 class MohawkEngine : public ::Engine {
 protected:
@@ -87,8 +80,8 @@ public:
 	uint32 getFeatures() const;
 	uint16 getVersion() const;
 	Common::Platform getPlatform() const;
-	uint8 getGameType();
-	Common::Language getLanguage();
+	uint8 getGameType() const;
+	Common::Language getLanguage() const;
 	
 	bool hasFeature(EngineFeature f) const;
 
@@ -105,7 +98,7 @@ protected:
 	void pauseEngineIntern(bool);
 
 	// An array holding the main Mohawk archives require by the games
-	Common::Array<MohawkFile*> _mhk;
+	Common::Array<MohawkFile *> _mhk;
 };
 
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index 1a4af35be1..cf9837043f 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -29,6 +29,9 @@
 #include "mohawk/myst.h"
 #include "mohawk/myst_scripts.h"
 #include "mohawk/myst_saveload.h"
+#include "mohawk/dialogs.h"
+#include "mohawk/file.h"
+#include "mohawk/video/video.h"
 
 namespace Mohawk {
 
diff --git a/engines/mohawk/myst.h b/engines/mohawk/myst.h
index df2e7bb56d..5a90de33ed 100644
--- a/engines/mohawk/myst.h
+++ b/engines/mohawk/myst.h
@@ -40,6 +40,7 @@ class MystGraphics;
 class MystScriptParser;
 class MystConsole;
 class MystSaveLoad;
+class MystOptionsDialog;
 
 // Engine Debug Flags
 enum {
diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp
index 64de638b44..a79e62ee2d 100644
--- a/engines/mohawk/myst_scripts.cpp
+++ b/engines/mohawk/myst_scripts.cpp
@@ -26,6 +26,8 @@
 #include "mohawk/myst.h"
 #include "mohawk/graphics.h"
 #include "mohawk/myst_scripts.h"
+#include "mohawk/sound.h"
+#include "mohawk/video/video.h"
 
 #include "gui/message.h"
 
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index bf98c64bdb..20cf55c398 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -31,6 +31,8 @@
 #include "mohawk/riven.h"
 #include "mohawk/riven_external.h"
 #include "mohawk/riven_saveload.h"
+#include "mohawk/dialogs.h"
+#include "mohawk/video/video.h"
 
 namespace Mohawk {
 
@@ -61,6 +63,11 @@ MohawkEngine_Riven::~MohawkEngine_Riven() {
 	_cardData.scripts.clear();
 }
 
+GUI::Debugger *MohawkEngine_Riven::getDebugger() {
+	return _console;
+}
+
+
 Common::Error MohawkEngine_Riven::run() {
 	MohawkEngine::run();
 
diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h
index d8ef5c281f..a09320bc16 100644
--- a/engines/mohawk/riven.h
+++ b/engines/mohawk/riven.h
@@ -39,6 +39,7 @@ class RivenGraphics;
 class RivenExternal;
 class RivenConsole;
 class RivenSaveLoad;
+class RivenOptionsDialog;
 
 #define RIVEN_STACKS 8
 
@@ -110,7 +111,7 @@ public:
 	Card _cardData;
 	bool _gameOver;
 	
-	GUI::Debugger *getDebugger() { return _console; }
+	GUI::Debugger *getDebugger();
 	
 	bool canLoadGameStateCurrently() { return true; }
 	bool canSaveGameStateCurrently() { return true; }
diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp
index 5108fd8867..da8040dc67 100644
--- a/engines/mohawk/riven_external.cpp
+++ b/engines/mohawk/riven_external.cpp
@@ -26,6 +26,8 @@
 #include "mohawk/graphics.h"
 #include "mohawk/riven.h"
 #include "mohawk/riven_external.h"
+#include "mohawk/sound.h"
+#include "mohawk/video/video.h"
 
 #include "common/EventRecorder.h"
 #include "gui/message.h"
diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp
index e04b2a6e3d..090b30d39c 100644
--- a/engines/mohawk/riven_scripts.cpp
+++ b/engines/mohawk/riven_scripts.cpp
@@ -27,6 +27,8 @@
 #include "mohawk/riven.h"
 #include "mohawk/riven_external.h"
 #include "mohawk/riven_scripts.h"
+#include "mohawk/sound.h"
+#include "mohawk/video/video.h"
 
 #include "common/stream.h"
 #include "graphics/cursorman.h"
diff --git a/engines/mohawk/video/qt_player.h b/engines/mohawk/video/qt_player.h
index 48c0ec357f..c40c291767 100644
--- a/engines/mohawk/video/qt_player.h
+++ b/engines/mohawk/video/qt_player.h
@@ -35,7 +35,6 @@
 #define MOHAWK_QT_PLAYER_H
 
 #include "common/scummsys.h"
-#include "common/file.h"
 
 #include "mohawk/video/video.h"
 
diff --git a/engines/mohawk/video/video.cpp b/engines/mohawk/video/video.cpp
index 1abebf75af..f13445d072 100644
--- a/engines/mohawk/video/video.cpp
+++ b/engines/mohawk/video/video.cpp
@@ -33,6 +33,8 @@
 #include "mohawk/video/rpza.h"
 #include "mohawk/video/smc.h"
 
+#include "common/events.h"
+
 namespace Mohawk {
 
 ////////////////////////////////////////////
diff --git a/engines/mohawk/video/video.h b/engines/mohawk/video/video.h
index 666873b9a6..fa160069c8 100644
--- a/engines/mohawk/video/video.h
+++ b/engines/mohawk/video/video.h
@@ -28,7 +28,7 @@
 
 #include "common/queue.h"
 #include "sound/audiostream.h"
-#include "sound/mixer.h"
+#include "sound/mixer.h"	// for Audio::SoundHandle
 #include "graphics/pixelformat.h"
 #include "graphics/video/codecs/codec.h"