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/tinsel/tinsel.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/tinsel/tinsel.cpp')
| -rw-r--r-- | engines/tinsel/tinsel.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 31cf3defdb..aed6aae097 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -29,6 +29,7 @@ #include "common/EventRecorder.h" #include "common/keyboard.h" #include "common/file.h" +#include "common/fs.h" #include "common/savefile.h" #include "common/config-manager.h" #include "common/serializer.h" @@ -834,11 +835,12 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); // Add DW2 subfolder to search path in case user is running directly from the CDs - SearchMan.addSubDirectoryMatching(_gameDataDir, "dw2"); + const Common::FSNode gameDataDir(ConfMan.get("path")); + SearchMan.addSubDirectoryMatching(gameDataDir, "dw2"); // Add subfolders needed for psx versions of Discworld 1 if (TinselV1PSX) - SearchMan.addDirectory(_gameDataDir.getPath(), _gameDataDir, 0, 3, true); + SearchMan.addDirectory(gameDataDir.getPath(), gameDataDir, 0, 3, true); const GameSettings *g; |