diff options
| author | Filippos Karapetis | 2007-07-14 14:18:45 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-07-14 14:18:45 +0000 |
| commit | 101dc5cb20afcce72107fdb3314a1b74637eced4 (patch) | |
| tree | fe5ac2d1f1bf38a61698527aa4c002fb7db23935 /engines | |
| parent | 009b100094363f1e1f167d9792a35af8a3c63793 (diff) | |
| download | scummvm-rg350-101dc5cb20afcce72107fdb3314a1b74637eced4.tar.gz scummvm-rg350-101dc5cb20afcce72107fdb3314a1b74637eced4.tar.bz2 scummvm-rg350-101dc5cb20afcce72107fdb3314a1b74637eced4.zip | |
Improved check for the patched sound file used in ITE intro
svn-id: r28070
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/saga/sndres.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp index c0c63eb06c..7033aaed33 100644 --- a/engines/saga/sndres.cpp +++ b/engines/saga/sndres.cpp @@ -177,9 +177,13 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff resourceType = kSoundWAV; } - // If the game has patch files, then it includes a patch file for sound resource 4, used in the intro. - // Don't treat this patch file as compressed sound. This file is always included if patch files are present - if ((_vm->getFeatures() & GF_COMPRESSED_SOUNDS) && !(_vm->getPatchesCount() > 0 && resourceId == 4)) { + bool patchedSound = false; + // If a patch file exists for sound resource 4 (used in ITE intro), don't treat this sound as compressed + if (_vm->getGameType() == GType_ITE && resourceId == 4 && + (Common::File::exists("sound/p2_a.iaf") || Common::File::exists("sound/p2_a.voc"))) + patchedSound = true; + + if ((_vm->getFeatures() & GF_COMPRESSED_SOUNDS) && !patchedSound) { if (soundResource[0] == char(0)) { resourceType = kSoundMP3; } else if (soundResource[0] == char(1)) { |