aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/resource.h1
-rw-r--r--engines/sci/sci.cpp18
-rw-r--r--engines/sci/sci.h2
3 files changed, 12 insertions, 9 deletions
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index b9825011e5..64e3cb4a12 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -27,6 +27,7 @@
#define SCI_SCICORE_RESOURCE_H
#include "common/str.h"
+#include "common/fs.h"
#include "sci/graphics/helpers.h" // for ViewType
#include "sci/decompressor.h"
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 87f156bc67..a730688c3c 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -96,18 +96,20 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc)
_gamestate = 0;
- SearchMan.addSubDirectoryMatching(_gameDataDir, "actors"); // KQ6 hi-res portraits
- SearchMan.addSubDirectoryMatching(_gameDataDir, "aud"); // resource.aud and audio files
- SearchMan.addSubDirectoryMatching(_gameDataDir, "avi"); // AVI movie files for Windows versions
- SearchMan.addSubDirectoryMatching(_gameDataDir, "seq"); // SEQ movie files for DOS versions
- SearchMan.addSubDirectoryMatching(_gameDataDir, "wav"); // speech files in WAV format
- SearchMan.addSubDirectoryMatching(_gameDataDir, "sfx"); // music/sound files in WAV format
- SearchMan.addSubDirectoryMatching(_gameDataDir, "robot"); // robot files
+ const Common::FSNode gameDataDir(ConfMan.get("path"));
+
+ SearchMan.addSubDirectoryMatching(gameDataDir, "actors"); // KQ6 hi-res portraits
+ SearchMan.addSubDirectoryMatching(gameDataDir, "aud"); // resource.aud and audio files
+ SearchMan.addSubDirectoryMatching(gameDataDir, "avi"); // AVI movie files for Windows versions
+ SearchMan.addSubDirectoryMatching(gameDataDir, "seq"); // SEQ movie files for DOS versions
+ SearchMan.addSubDirectoryMatching(gameDataDir, "wav"); // speech files in WAV format
+ SearchMan.addSubDirectoryMatching(gameDataDir, "sfx"); // music/sound files in WAV format
+ SearchMan.addSubDirectoryMatching(gameDataDir, "robot"); // robot files
// Add the patches directory, except for KQ6CD; The patches folder in some versions of KQ6CD
// is for the demo of Phantasmagoria, included in the disk
if (strcmp(getGameID(), "kq6"))
- SearchMan.addSubDirectoryMatching(_gameDataDir, "patches"); // resource patches
+ SearchMan.addSubDirectoryMatching(gameDataDir, "patches"); // resource patches
}
SciEngine::~SciEngine() {
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index b208824357..fdd10bcd04 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -27,7 +27,7 @@
#define SCI_H
#include "engines/engine.h"
-//#include "engines/advancedDetector.h"
+#include "common/util.h"
struct ADGameDescription;