diff options
| author | Fabio Battaglia | 2009-06-16 18:58:21 +0000 |
|---|---|---|
| committer | Fabio Battaglia | 2009-06-16 18:58:21 +0000 |
| commit | b905602b4c0e454d73b7f0f8b3d1d251b88a431c (patch) | |
| tree | 0e818777d3ae4d25842d83df7ec8e15ed22be060 /engines/tinsel | |
| parent | 975a0d65677a45559b1f5d4262772c0696f405b6 (diff) | |
| download | scummvm-rg350-b905602b4c0e454d73b7f0f8b3d1d251b88a431c.tar.gz scummvm-rg350-b905602b4c0e454d73b7f0f8b3d1d251b88a431c.tar.bz2 scummvm-rg350-b905602b4c0e454d73b7f0f8b3d1d251b88a431c.zip | |
tinsel: check only english.txt for DW1 psx version detection, and use recursive "SearchMan.addDirectory()" to obtain subdirs for Discworld PSX datafiles
svn-id: r41587
Diffstat (limited to 'engines/tinsel')
| -rw-r--r-- | engines/tinsel/detection.cpp | 6 | ||||
| -rw-r--r-- | engines/tinsel/tinsel.cpp | 15 |
2 files changed, 3 insertions, 18 deletions
diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 863848bee1..a3cd0bc7b7 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -297,15 +297,11 @@ static const TinselGameDescription gameDescriptions[] = { TINSEL_V1, }, - { // UK multilanguage PSX CD + { // Discworld PSX CD { "dw", "CD", { - {"french.txt", 0, "e7020d35f58d0d187052ac406d86cc87", 273918}, - {"german.txt", 0, "6e2c0f0655bc3cec5a6b3552164ec984", 263942}, - {"italian.txt", 0, "15f0703f85477d7fab4280bf938b61c1", 239830}, - {"spanish.txt", 0, "bda9bea9078d1483409082a3e180378a", 236702}, {"english.txt", 0, "7526cfc3a64e00f223795de476b4e2c9", 230326}, {NULL, 0, NULL, 0} }, diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 47602b5862..20dc18068b 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -850,19 +850,8 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) Common::File::addDefaultDirectory(_gameDataDir.getChild("dw2")); // Add subfolders needed for psx versions of Discworld 1 - if(TinselV1PSX) { - Common::File::addDefaultDirectory(_gameDataDir.getChild("MIDI")); - Common::File::addDefaultDirectory(_gameDataDir.getChild("SAMPLES")); - Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX")); - Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXAB")); - Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXC")); - Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXDG")); - Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXHL")); - Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXMO")); - Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXP")); - Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXRS")); - Common::File::addDefaultDirectory(_gameDataDir.getChild("GFX").getChild("GFXTW")); - } + if(TinselV1PSX) + SearchMan.addDirectory(_gameDataDir.getPath(), _gameDataDir, 0, 3, true); const GameSettings *g; |