diff options
author | Max Horn | 2010-05-04 11:56:52 +0000 |
---|---|---|
committer | Max Horn | 2010-05-04 11:56:52 +0000 |
commit | 5568a8473b975dc2e7e0d1f1ae075ebd6d96f2f3 (patch) | |
tree | e16103eabfe926312a01e0d3a18efc1fd7f6a5d9 /engines/saga/saga.cpp | |
parent | c5f94872a7c4a1082f7c401c4e90f9bd3bf0290e (diff) | |
download | scummvm-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/saga/saga.cpp')
-rw-r--r-- | engines/saga/saga.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp index f67194b2f0..8ccc6d96e5 100644 --- a/engines/saga/saga.cpp +++ b/engines/saga/saga.cpp @@ -23,9 +23,8 @@ * */ - - #include "common/file.h" +#include "common/fs.h" #include "common/config-manager.h" #include "common/system.h" #include "common/events.h" @@ -112,28 +111,30 @@ SagaEngine::SagaEngine(OSystem *syst, const SAGAGameDescription *gameDesc) _frameCount = 0; + const Common::FSNode gameDataDir(ConfMan.get("path")); + // The Linux version of Inherit the Earth puts all data files in an // 'itedata' sub-directory, except for voices.rsc - SearchMan.addSubDirectoryMatching(_gameDataDir, "itedata"); + SearchMan.addSubDirectoryMatching(gameDataDir, "itedata"); // The Windows version of Inherit the Earth puts various data files in // other subdirectories. - SearchMan.addSubDirectoryMatching(_gameDataDir, "graphics"); - SearchMan.addSubDirectoryMatching(_gameDataDir, "music"); - SearchMan.addSubDirectoryMatching(_gameDataDir, "sound"); + SearchMan.addSubDirectoryMatching(gameDataDir, "graphics"); + SearchMan.addSubDirectoryMatching(gameDataDir, "music"); + SearchMan.addSubDirectoryMatching(gameDataDir, "sound"); // The Multi-OS version puts the voices file in the root directory of // the CD. The rest of the data files are in game/itedata - SearchMan.addSubDirectoryMatching(_gameDataDir, "game/itedata"); + SearchMan.addSubDirectoryMatching(gameDataDir, "game/itedata"); // Mac CD Wyrmkeep - SearchMan.addSubDirectoryMatching(_gameDataDir, "patch"); + SearchMan.addSubDirectoryMatching(gameDataDir, "patch"); // Dinotopia - SearchMan.addSubDirectoryMatching(_gameDataDir, "smack"); + SearchMan.addSubDirectoryMatching(gameDataDir, "smack"); // FTA2 - SearchMan.addSubDirectoryMatching(_gameDataDir, "video"); + SearchMan.addSubDirectoryMatching(gameDataDir, "video"); _displayClip.left = _displayClip.top = 0; g_eventRec.registerRandomSource(_rnd, "saga"); |