diff options
author | Travis Howell | 2005-11-18 00:59:10 +0000 |
---|---|---|
committer | Travis Howell | 2005-11-18 00:59:10 +0000 |
commit | fc0713af817455561872f8e827451ba7708611a3 (patch) | |
tree | 7d1091bf3b8acb00be5ada41a153f393ee269b02 /scumm | |
parent | f8eb9cc5024b06df5775b9c29890b2997c2a7ece (diff) | |
download | scummvm-rg350-fc0713af817455561872f8e827451ba7708611a3.tar.gz scummvm-rg350-fc0713af817455561872f8e827451ba7708611a3.tar.bz2 scummvm-rg350-fc0713af817455561872f8e827451ba7708611a3.zip |
More changes for bundled Macintosh versions.
svn-id: r19633
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/scumm.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 5639c0a425..66f327c1a8 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -715,7 +715,7 @@ static SubstResFileNames substResFileNameTable[] = { { "dig.la0", "The Dig Demo Data", kGenAsIs }, { "dig", "digdemo", kGenPC }, { "ft.la0", "Full Throttle Data", kGenAsIs }, - { "ft.la0", "Full Throttle Demo Data", kGenAsIs }, + { "ftdemo.la0", "Full Throttle Demo Data", kGenAsIs }, { "ft.la0", "Vollgas Data", kGenAsIs }, { "ft.la0", "Vollgas Demo Data", kGenAsIs }, { "ft.la0", "ft.000", kGenAsIs }, @@ -973,14 +973,15 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS } else _fileHandle = new ScummFile(); - // The mac versions of Sam&Max, DOTT, FT and The Dig used a special meta - // (container) file format to store the actual SCUMM data files. The - // rescumm utility used to be used to extract those files. While that is - // still possible, we now support reading those files directly. - // The first step is to check whether one of them is present (we do that - // here); the rest is handled by the ScummFile class and code in - // openResourceFile() (and in the Sound class, for MONSTER.SOU handling). - if (_version >= 6 && _heversion == 0 && _substResFileNameIndex && + // The mac versions of Indy4, Sam&Max, DOTT, FT and The Dig used a + // special meta (container) file format to store the actual SCUMM data + // files. The rescumm utility used to be used to extract those files. + // While that is still possible, we now support reading those files + // directly. The first step is to check whether one of them is present + // (we do that here); the rest is handled by the ScummFile class and + // code in openResourceFile() (and in the Sound class, for MONSTER.SOU + // handling). + if (_version >= 5 && _heversion == 0 && _substResFileNameIndex && _platform == Common::kPlatformMacintosh && substResFileNameTable[_substResFileNameIndex].genMethod == kGenAsIs) { if (_fileHandle->open(substResFileNameTable[_substResFileNameIndex].macName)) { |