diff options
Diffstat (limited to 'engines/mohawk')
| -rw-r--r-- | engines/mohawk/mohawk.h | 4 | ||||
| -rw-r--r-- | engines/mohawk/myst.cpp | 6 | ||||
| -rw-r--r-- | engines/mohawk/riven.cpp | 12 | ||||
| -rw-r--r-- | engines/mohawk/riven_scripts.h | 1 |
4 files changed, 16 insertions, 7 deletions
diff --git a/engines/mohawk/mohawk.h b/engines/mohawk/mohawk.h index f5ad730d81..e4d26d16f7 100644 --- a/engines/mohawk/mohawk.h +++ b/engines/mohawk/mohawk.h @@ -33,6 +33,10 @@ class OSystem; +namespace Common { + class SeekableReadStream; +} + namespace Mohawk { enum MohawkGameType { diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 849440774b..ab55552ef4 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -74,8 +74,10 @@ MohawkEngine_Myst::MohawkEngine_Myst(OSystem *syst, const MohawkGameDescription _scriptParser->disableInitOpcodes(); - if ((getFeatures() & GF_ME) && getPlatform() == Common::kPlatformMacintosh) - SearchMan.addSubDirectoryMatching(_gameDataDir, "CD Data"); + if ((getFeatures() & GF_ME) && getPlatform() == Common::kPlatformMacintosh) { + const Common::FSNode gameDataDir(ConfMan.get("path")); + SearchMan.addSubDirectoryMatching(gameDataDir, "CD Data"); + } } MohawkEngine_Myst::~MohawkEngine_Myst() { diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 805ba52f8a..0412144034 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -49,12 +49,14 @@ MohawkEngine_Riven::MohawkEngine_Riven(OSystem *syst, const MohawkGameDescriptio _activatedSLST = false; _extrasFile = NULL; - // Attempt to let game run from the CD's + // Attempt to let game run from the CDs // NOTE: assets2 contains higher quality audio than assets1 - SearchMan.addSubDirectoryMatching(_gameDataDir, "all"); - SearchMan.addSubDirectoryMatching(_gameDataDir, "data"); - SearchMan.addSubDirectoryMatching(_gameDataDir, "exe"); - SearchMan.addSubDirectoryMatching(_gameDataDir, "assets2"); + const Common::FSNode gameDataDir(ConfMan.get("path")); + + SearchMan.addSubDirectoryMatching(gameDataDir, "all"); + SearchMan.addSubDirectoryMatching(gameDataDir, "data"); + SearchMan.addSubDirectoryMatching(gameDataDir, "exe"); + SearchMan.addSubDirectoryMatching(gameDataDir, "assets2"); g_atrusJournalRectSolo = new Common::Rect(295, 402, 313, 426); g_atrusJournalRect = new Common::Rect(222, 402, 240, 426); diff --git a/engines/mohawk/riven_scripts.h b/engines/mohawk/riven_scripts.h index f61abee36b..a1512af697 100644 --- a/engines/mohawk/riven_scripts.h +++ b/engines/mohawk/riven_scripts.h @@ -27,6 +27,7 @@ #define RIVEN_SCRIPTS_H #include "common/str-array.h" +#include "common/ptr.h" class MohawkEngine_Riven; |