aboutsummaryrefslogtreecommitdiff
path: root/engines/m4
diff options
context:
space:
mode:
authorMax Horn2010-05-04 11:56:52 +0000
committerMax Horn2010-05-04 11:56:52 +0000
commit5568a8473b975dc2e7e0d1f1ae075ebd6d96f2f3 (patch)
treee16103eabfe926312a01e0d3a18efc1fd7f6a5d9 /engines/m4
parentc5f94872a7c4a1082f7c401c4e90f9bd3bf0290e (diff)
downloadscummvm-rg350-5568a8473b975dc2e7e0d1f1ae075ebd6d96f2f3.tar.gz
scummvm-rg350-5568a8473b975dc2e7e0d1f1ae075ebd6d96f2f3.tar.bz2
scummvm-rg350-5568a8473b975dc2e7e0d1f1ae075ebd6d96f2f3.zip
Get rid of Engine::_gameDataDir.
This greatly reduces indirect dependencies on several header files from common. svn-id: r48933
Diffstat (limited to 'engines/m4')
-rw-r--r--engines/m4/m4.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp
index f613064888..97b03c8582 100644
--- a/engines/m4/m4.cpp
+++ b/engines/m4/m4.cpp
@@ -52,6 +52,7 @@
#include "m4/mads_menus.h"
#include "common/file.h"
+#include "common/fs.h"
#include "common/events.h"
#include "common/EventRecorder.h"
#include "common/endian.h"
@@ -111,8 +112,10 @@ MadsM4Engine::MadsM4Engine(OSystem *syst, const M4GameDescription *gameDesc) :
_vm = this;
_madsVm = NULL;
- SearchMan.addSubDirectoryMatching(_gameDataDir, "goodstuf");
- SearchMan.addSubDirectoryMatching(_gameDataDir, "resource");
+ const Common::FSNode gameDataDir(ConfMan.get("path"));
+
+ SearchMan.addSubDirectoryMatching(gameDataDir, "goodstuf");
+ SearchMan.addSubDirectoryMatching(gameDataDir, "resource");
DebugMan.addDebugChannel(kDebugScript, "script", "Script debug level");
DebugMan.addDebugChannel(kDebugGraphics, "graphics", "Graphics debug level");